diff --git a/src/platforms/px4_micro_hal.h b/src/platforms/px4_micro_hal.h
index d506408367..9fa8e3e299 100644
--- a/src/platforms/px4_micro_hal.h
+++ b/src/platforms/px4_micro_hal.h
@@ -178,7 +178,11 @@ __BEGIN_DECLS
  */
 #    define PX4_CPU_MFGUID_BYTE_LENGTH              PX4_CPU_UUID_BYTE_LENGTH
 
+<<<<<<< HEAD
 /* define common formating across all commands */
+=======
+/* define common formating accross all commands */
+>>>>>>> Adding Kinetis board common identity to micro hal
 
 #    define PX4_CPU_UUID_WORD32_FORMAT              "%08x"
 #    define PX4_CPU_UUID_WORD32_SEPARATOR           ":"