diff --git a/inc/mem_seg.h b/inc/mem_seg.h
index ffc8b47..9e1b760 100644
--- a/inc/mem_seg.h
+++ b/inc/mem_seg.h
@@ -1,9 +1,12 @@
 #ifndef __MEM_SEG_H__
 #define __MEM_SEG_H__
 
+<<<<<<< HEAD
 #ifndef DEVICE_TYPE
 #define DEVICE_TYPE EXTENDED_DEVICE_TYPE_DUMMY
 #endif
+=======
+>>>>>>> 1f4cc4d (Initial commit)
 
 // #define MEMSEG_PC_SEG_NUM 0
 // #define MEMSEG_PC_ADDR 0
diff --git a/src/device.c b/src/device.c
index ba834ab..4343847 100644
--- a/src/device.c
+++ b/src/device.c
@@ -730,7 +730,11 @@ device_public_context_t* init(device_specs_t* specs, char* errbuf)
 
 uint8_t pubDeviceType() 
 {
+<<<<<<< HEAD
     return DEVICE_TYPE;
+=======
+    return EXTENDED_DEVICE_TYPE_DUMMY;
+>>>>>>> 1f4cc4d (Initial commit)
 }