diff --git a/src/screen.h b/src/screen.h
index 011ecc28e..c39554eeb 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -179,16 +179,12 @@ extern UINT8 setrenderneeded;
 extern INT32 scr_bpp;
 extern UINT8 *scr_borderpatch; // patch used to fill the view borders
 
-<<<<<<< HEAD
-extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
-=======
+extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen, cv_vhseffect, cv_shittyscreen;
 extern CV_PossibleValue_t cv_renderer_t[];
 
-extern consvar_t cv_scr_width, cv_scr_height, cv_scr_depth, cv_renderview, cv_renderer, cv_fullscreen;
 #ifdef HWRENDER
 extern consvar_t cv_newrenderer;
 #endif
->>>>>>> srb2/next
 // wait for page flipping to end or not
 extern consvar_t cv_vidwait;
 
@@ -208,10 +204,7 @@ FUNCMATH boolean SCR_IsAspectCorrect(INT32 width, INT32 height);
 
 // move out to main code for consistency
 void SCR_DisplayTicRate(void);
-<<<<<<< HEAD
-=======
 void SCR_ClosedCaptions(void);
->>>>>>> srb2/next
 void SCR_DisplayLocalPing(void);
 #undef DNWH
 #endif //__SCREEN_H__