diff --git a/firmware/inc/hw_config.h b/firmware/inc/hw_config.h
index 159f07b..681e91f 100644
--- a/firmware/inc/hw_config.h
+++ b/firmware/inc/hw_config.h
@@ -121,11 +121,7 @@
 /**
  * XOSC
  */
-<<<<<<< HEAD
 //define USE_XOSC
-=======
-//#define USE_XOSC
->>>>>>> aprs_dev
 #define XOSC_FREQUENCY		16369000
 #define XOSC_GCLK1_DIVIDE	4
 
diff --git a/firmware/src/xosc.c b/firmware/src/xosc.c
index 6796745..78c57ea 100644
--- a/firmware/src/xosc.c
+++ b/firmware/src/xosc.c
@@ -63,15 +63,9 @@ void xosc_init(void) {
   /* Configure GCLK1 to XOSC */
   system_gclk_gen_set_config(GCLK_GENERATOR_1,
 #ifdef USE_XOSC
-<<<<<<< HEAD
-        		     GCLK_SOURCE_XOSC, /* Source 		*/
-#else
-                             GCLK_SOURCE_OSC8M, /* Source 		*/
-=======
         		     GCLK_SOURCE_XOSC,	/* Source 		*/
 #else
                              GCLK_SOURCE_OSC8M,	/* Source 		*/
->>>>>>> aprs_dev
 #endif
         		     false,		/* High When Disabled	*/
         		     XOSC_GCLK1_DIVIDE, /* Division Factor	*/