diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index a5e29dc..984f8d3 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -60,7 +60,6 @@
   { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH},
   { .fd = -1, .name = "babeld", .flag = VTYSH_BABELD, .path = BABEL_VTYSH_PATH},
   { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH},
->>>>>>> [pim] pim commands added to vtysh
 };