diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index b6cc5ba4b18f..4bf80e7429a9 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11817,8 +11817,12 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
 		} else {
 			if (incremental_print) {
 				vty_out(vty, "\"prefix\": \"%pFX\",\n", p);
+<<<<<<< HEAD
 				vty_out(vty, "\"version\": \"%" PRIu64 "\",\n",
 					dest->version);
+=======
+				vty_out(vty, "\"version\": %" PRIu64 ",", dest->version);
+>>>>>>> c5d7815ccc (bgpd: fix version attribute is an int, not a string)
 			} else {
 				json_object_string_addf(json, "prefix", "%pFX",
 							p);