diff --git a/src/c/ScriptCmds/ScopedProcessMutex.h b/src/c/ScriptCmds/ScopedProcessMutex.h
index fb55b2230e66db80f712c3a7143471d86450622f..02f27255a32c3790f879203542a18dc528e6ecf4 100644
--- a/src/c/ScriptCmds/ScopedProcessMutex.h
+++ b/src/c/ScriptCmds/ScopedProcessMutex.h
@@ -3,11 +3,7 @@
 #ifdef USE_PROCESS_MUTEX
  #define SCOPED_PROCESS_MUTEX(Name) ScopedProcessMutex Name##_mutex(#Name)
 #else
-<<<<<<< HEAD
-#pragma message "hi friend: no process mutex"
-=======
-#pragma message ("HIP (leverjs) ::  no process mutex in use")
->>>>>>> f7b83d58739d9ee780da4851cbe4206199306a7b
+ #pragma message ("HIP (leverjs) ::  no process mutex in use")
  #define SCOPED_PROCESS_MUTEX(Name)
 #endif