diff --git a/gtsam/config.h.in b/gtsam/config.h.in
index da7482016..9ba562cc4 100644
--- a/gtsam/config.h.in
+++ b/gtsam/config.h.in
@@ -26,11 +26,7 @@
 
 // Paths to example datasets distributed with GTSAM
 #define GTSAM_SOURCE_TREE_DATASET_DIR "@GTSAM_SOURCE_DIR@/examples/Data"
-<<<<<<< HEAD
-#ifndef __QNX__  
-=======
 #if !defined(__QNX__) 
->>>>>>> 93f463ddbf8e990e6dccc622fcb8ecb67f21549a
 #define GTSAM_INSTALLED_DATASET_DIR "@GTSAM_TOOLBOX_INSTALL_PATH@/gtsam_examples/Data"
 #else
 //Set toolbox path to the path on the target.