diff --git a/devices/common/ata/atadefs.h b/devices/common/ata/atadefs.h
index 832480d..8c420ec 100644
--- a/devices/common/ata/atadefs.h
+++ b/devices/common/ata/atadefs.h
@@ -69,23 +69,13 @@ enum IDE_Error : int {
     BBK    = 0x80
 };
 
-<<<<<<< HEAD
 /** Bit definition for the device control register. */
 enum {
     ATA_CTRL_nIEN = 1 << 1,
     ATA_CTRL_SRST = 1 << 2,
 };
 
-/** ATA commands. */
-=======
-/* ATA Signals */
-enum IDE_Signal : int { 
-    PDIAG = 0x22, 
-    DASP = 0x27 
-};
-
 /* ATA commands. */
->>>>>>> 1e9ec5d... Start ATA command support
 enum IDE_Cmd : int {
     NOP              = 0x00,
     RESET_ATAPI      = 0x08,
diff --git a/devices/common/ata/idechannel.h b/devices/common/ata/idechannel.h
index daa49a0..9fd8c63 100644
--- a/devices/common/ata/idechannel.h
+++ b/devices/common/ata/idechannel.h
@@ -45,14 +45,8 @@ public:
         return std::unique_ptr<IdeChannel>(new IdeChannel("IDE1"));
     }
 
-<<<<<<< HEAD
     uint32_t read(const uint8_t reg_addr, const int size);
     void write(const uint8_t reg_addr, const uint32_t val, const int size);
-=======
-    uint16_t read(const uint8_t reg_addr, const int size);
-    void write(const uint8_t reg_addr, const uint16_t val, const int size);
-    //void talk_to_channel(std::string name)
->>>>>>> 1e9ec5d... Start ATA command support
 
 private:
     int         cur_dev = 0;