diff --git a/src/lua_script.h b/src/lua_script.h
index e112773f8..2b7423d0f 100644
--- a/src/lua_script.h
+++ b/src/lua_script.h
@@ -37,13 +37,9 @@
 void LUA_ClearExtVars(void);
 #endif
 
-<<<<<<< HEAD
 void LUA_ClearState(void);
 
-extern boolean lua_lumploading; // is LUA_LoadLump being called?
-=======
 extern INT32 lua_lumploading; // is LUA_LoadLump being called?
->>>>>>> srb2/next
 
 int LUA_GetErrorMessage(lua_State *L);
 void LUA_LoadLump(UINT16 wad, UINT16 lump, boolean noresults);