diff --git a/nlsr_sync.c b/nlsr_sync.c
index d523bed..a7a130c 100644
--- a/nlsr_sync.c
+++ b/nlsr_sync.c
@@ -141,11 +141,7 @@
 
 
 
-<<<<<<< HEAD
-void 
-=======
-	void 
->>>>>>> 806df81f471eddcdef48b2ab64eaec8aaca2e69c
+void
 get_name_part(struct name_prefix *name_part,struct ccn_charbuf * interest_ccnb, 
 		struct ccn_indexbuf *interest_comps, int offset)
 {