Fix merge conflits

src/CMakeLists.txt

src/Makefile.d/detect.mk

src/Makefile.d/haiku.mk

src/Makefile.d/platform.mk

src/Makefile.d/sdl.mk

src/d_think.h

src/f_finale.c

src/g_demo.c

src/g_game.c

src/lua_blockmaplib.c

src/lua_script.c

src/m_cheat.c

src/m_perfstats.c

src/netcode/d_clisrv.c

src/p_enemy.c

src/p_inter.c

src/p_local.h

src/p_map.c

src/p_maputl.c

src/p_mobj.c