diff --git a/src/ByteCode/ClassFile.hs b/src/ByteCode/ClassFile.hs
index a833f3f..aeab84a 100644
--- a/src/ByteCode/ClassFile.hs
+++ b/src/ByteCode/ClassFile.hs
@@ -97,7 +97,6 @@ instance Serializable MemberInfo where
                     ++ concatMap serialize (memberAttributes member)
 
 instance Serializable Operation where
-<<<<<<< HEAD
     serialize Opiadd              = [0x60]
     serialize Opisub              = [0x64]
     serialize Opimul              = [0x68]
@@ -112,22 +111,6 @@ instance Serializable Operation where
     serialize (Opistore index)    = [0xC4, 0x36] ++ unpackWord16 index
     serialize (Opputfield index)  = 0xB5 : unpackWord16 index
     serialize (OpgetField index)  = 0xB4 : unpackWord16 index
-=======
-    serialize Iadd              = [0x60]
-    serialize Isub              = [0x64]
-    serialize Imul              = [0x68]
-    serialize Idiv              = [0x6C]
-    serialize Return            = [0xB1]
-    serialize IReturn           = [0xAC]
-    serialize (Sipush index)    = 0x11 : unpackWord16 index
-    serialize (Ldc_w index)     = 0x13 : unpackWord16 index
-    serialize (Aload index)     = [0xC4, 0x19] ++ unpackWord16 index
-    serialize (Iload index)     = [0xC4, 0x15] ++ unpackWord16 index
-    serialize (Astore index)    = [0xC4, 0x3A] ++ unpackWord16 index
-    serialize (Istore index)    = [0xC4, 0x36] ++ unpackWord16 index
-    serialize (Putfield index)  = 0xB5 : unpackWord16 index
-    serialize (GetField index)  = 0xB4 : unpackWord16 index
->>>>>>> 8b5650dd6104d1e350128fdcee37502d65824370
 
 instance Serializable Attribute where
     serialize (CodeAttribute { attributeMaxStack = maxStack,