diff --git a/src/d_main.c b/src/d_main.c
index bec5a3e2d..418da4ecc 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1292,10 +1292,7 @@ void D_SRB2Main(void)
 		needpatchrecache = true;
 		VID_CheckRenderer();
 		SCR_ChangeRendererCVars(setrenderneeded);
-<<<<<<< HEAD
-=======
 		D_CheckRendererState();
->>>>>>> origin/master
 		setrenderneeded = 0;
 	}