diff --git a/H/inline-only.h b/H/inline-only.h
index 7ffc36bf6..da291a26b 100644
--- a/H/inline-only.h
+++ b/H/inline-only.h
@@ -2,8 +2,8 @@
 #define _YAP_INLINE_ONLY_H_
 
 #ifdef __GNUC__
-//#define INLINE_ONLY __attribute__((gnu_inline,always_inline))
-#define INLINE_ONLY
+#define INLINE_ONLY __attribute__((gnu_inline,always_inline))
+//#define INLINE_ONLY
 #else
 #define INLINE_ONLY
 #endif
diff --git a/H/yapio.h b/H/yapio.h
index 101ea8aa7..56a897b65 100644
--- a/H/yapio.h
+++ b/H/yapio.h
@@ -327,13 +327,8 @@ extern int errno;
 INLINE_ONLY EXTERN inline UInt STD_PROTO(HashFunction, (unsigned char *));
 INLINE_ONLY EXTERN inline UInt STD_PROTO(WideHashFunction, (wchar_t *));
 
-<<<<<<< HEAD
-EXTERN inline UInt
-HashFunction(unsigned char *CHP) INLINE_ONLY
-=======
 INLINE_ONLY EXTERN inline UInt
 HashFunction(unsigned char *CHP)
->>>>>>> 97163fa150ba570e4ba2881646363e9877a07bcb
 {
   /* djb2 */
   UInt hash = 5381;