diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index 0d0fd57fc..6bf9eab9e 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -300,11 +300,6 @@ static inline boolean I_SkipFrame(void)
 				return false;
 		/* FALLTHRU */
 		//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
-<<<<<<< HEAD
-=======
-#ifndef NONET
->>>>>>> srb2/next
-		/* FALLTHRU */
 		case GS_WAITINGPLAYERS:
 			return skip; // Skip odd frames
 		default: