diff --git a/src/sdl/SDL_icon.xpm b/src/sdl/SDL_icon.xpm
index db3563582..0acac88ec 100644
--- a/src/sdl/SDL_icon.xpm
+++ b/src/sdl/SDL_icon.xpm
@@ -1,6 +1,5 @@
 /* XPM */
 static const char *SDL_icon_xpm[] = {
-<<<<<<< HEAD
 /* columns rows colors chars-per-pixel */
 "64 64 32 1",
 " 	c None",
@@ -98,102 +97,4 @@ static const char *SDL_icon_xpm[] = {
 "                    ....}./1))))))))))))]/...                   ",
 "                     ........}3||1#$$$]1...                     ",
 "                       ...................                      ",
-=======
-"64 64 32 1",
-" 	c None",
-".	c #000271",
-"+	c #03035D",
-"@	c #00009F",
-"#	c #0A0A1B",
-"$	c #08058E",
-"%	c #060E4C",
-"&	c #11110E",
-"*	c #101339",
-"=	c #0D11CC",
-"-	c #1B1CFD",
-";	c #342B24",
-">	c #2325EC",
-",	c #3C3883",
-"'	c #3D3A9E",
-")	c #5B5170",
-"!	c #4B4CFF",
-"~	c #795339",
-"{	c #5E5B5C",
-"]	c #5F5ED3",
-"^	c #5E5EFB",
-"/	c #7271FF",
-"(	c #B37F5D",
-"_	c #8F8883",
-":	c #8887FF",
-"<	c #D59E76",
-"[	c #ABABA9",
-"}	c #A9AAFF",
-"|	c #C1C3C1",
-"1	c #FAC296",
-"2	c #D4D6D3",
-"3	c #F9FCF8",
-"                                                                ",
-"                                                                ",
-"                              #***,,,****                       ",
-"                          *,,]]]]]]]]]]]]]',,**                 ",
-"                       *,']//////////////////]]',*              ",
-"                    *,']/////////////////////////]'%            ",
-"                  *,]////////////////////^^!!>>>>>>>$+          ",
-"                *,]////////////////////!>---------->=@%         ",
-"    *          ,]///////////////////]^>------->==@@@$.#         ",
-"   +',       *']//////////////////],,,=---->=@@@@@$.%           ",
-"  #.=^'*    ,]//////////////////],']^]$--=@@@@@@@$+#            ",
-"  %$=-^'*  ,]/////////////////],]/!>-^'=@@@@@@@$.%              ",
-"  +$=->/,*,//////////////////]'/^!,$-!,$@@@@@@$+*               ",
-"  +@=--!''/////////////////]']^!,(()->%$@@@@@$+#                ",
-"  +@=--='/////////////////]']^${(<<)->,$@@@@$%                  ",
-"  +@=->']/////////:::////]]/^'(<111)->,$@@@$%                   ",
-" #+@@>$]////////::}}}://///!,(<1111)--%$@@.%                    ",
-" #+@@$$^////////:}}}}}://^>$(<<1111)--+$@.%                     ",
-"  +@$.>^///////:}}}}}}:/^>->,(<111<'--+$$*#                     ",
-"  +$.=-!///////:}}}}}:^!-----@(111<@--+$,'],,*                  ",
-"  %+%=->^///////:}}}:!--------@(11(=--$=^////],*                ",
-"  ,]]'>->^//////^^!!-----------'<1_>--@-!//////]'*              ",
-"  '!->@--->>>>>>--->===>--------)<,-->@->^///////]',            ",
-" *$--->----------='){__{'>------>'=--=@-->!^///////],*          ",
-" %$.=---------->$)[22332[)=----------=>----->^^//////],         ",
-" %$_,--------->'_|3333333['----------=--------->!^////],#       ",
-" *'[{=--------'_2333333333_=---------------------->!^///,*      ",
-" #)[_@-------@_|33333333332,------------------------->!^/'*     ",
-" #)2[$------=)|333332|23333{>--------------------------->^'*    ",
-"  {2|,------$[233333___3333_=----------------------------->$    ",
-"  ;22)=---->)|333332{2_2333[@-------------------------------$   ",
-"  &22{@----$_233333|{2||333|'--------------------------------$  ",
-"  &|3_.----,|333333[;2|[333|'--------------------------------=+ ",
-"   [3_%=--={2333333[&___333|'-------------------->>>====>>----@ ",
-"   _3[#$=@.[2333333[&&&_333[$------------->>==@@@@@@@@@@@@@@@==+",
-"   {3|;+$$)|3333333[&&&[333_=-------->==@@@@@@@@@@@@@@@$$$$.+++%",
-"   {23{*$${23333333|;&&|332)>----->=@@@@@@@@@@@@@@$$$.++%**     ",
-";{{;[3{&*)[333333333{&&|332,=---==@@@@@@@@@@@@$$.++%*           ",
-"{22_{|[;_|2333333333_&;233_$@@@@@@@@@@@@@@@@$$+%*               ",
-"&_|2{;{{[233333333332_[33[,$@@@@@@@@@@@@@$$+%#                  ",
-" &;{&&&;~(_|3333333333332)$@@@@@@@@@@@@$.+%#                    ",
-"  &&&&&;(11([33333333332{$@@@@@@@@@@@$...$@$*                   ",
-"    &~((1111<[333333332{%.$@@@@@@@@@$$$$@=--$                   ",
-"     ~<<11111<[33333|[_(<~,$@@@@@@@@@@@@@>-->.                  ",
-"     ;(<111111<(____(11111(+@@@@@@@@@@@@=----=%                 ",
-"      ~(<11111111<11111<(<<;$@@$$@@@@@@@=-----.                 ",
-"       ~(<1111111111111(~<1{$$$.$@@@@@@@=-----=                 ",
-"        ~(<1111111<<(((<11<*$+.$@@@@@@@@@>---->+                ",
-"         ;(<1111111<<1111<~%+$@@@@@@@@@@@=-----$                ",
-"           ~(<<111111111(~&*+$$$@@@@@@@@@@=----=%               ",
-"             ;~((<<<<(~~;    *%+$$@@@@@@@@@>----+               ",
-"                 ;;;            #%+$$@@@@@@@----.               ",
-"                                   *+$$@@@@@=---@               ",
-"                                     *+$@@@@@>--=               ",
-"                                       *.$@@@@-->%              ",
-"                                        #%.$@@=->+              ",
-"                                          *+$@@>-$              ",
-"                                            %$@=-$              ",
-"                                             %.@>@              ",
-"                                               +=@              ",
-"                                                ..              ",
-"                                                 *              ",
-"                                                                ",
->>>>>>> srb2/next
 "                                                                "};
diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index 2cd5b14a2..4f026bad0 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -92,10 +92,7 @@ void *hwSym(const char *funcName,void *handle)
 	GETFUNC(DrawModel);
 	GETFUNC(CreateModelVBOs);
 	GETFUNC(SetTransform);
-<<<<<<< HEAD
-=======
 	GETFUNC(GetRenderVersion);
->>>>>>> srb2/next
 	GETFUNC(PostImgRedraw);
 	GETFUNC(FlushScreenTextures);
 	GETFUNC(StartScreenWipe);
@@ -105,7 +102,7 @@ void *hwSym(const char *funcName,void *handle)
 	GETFUNC(MakeScreenTexture);
 	GETFUNC(MakeScreenFinalTexture);
 	GETFUNC(DrawScreenFinalTexture);
-	
+
 	GETFUNC(RenderSkyDome);
 
 	GETFUNC(LoadShaders);
@@ -115,7 +112,7 @@ void *hwSym(const char *funcName,void *handle)
 
 	GETFUNC(LoadCustomShader);
 	GETFUNC(InitCustomShaders);
-	
+
 	GETFUNC(StartBatching);
 	GETFUNC(RenderBatches);
 
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index f8c8bfe1e..9af94c5f1 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -27,11 +27,7 @@
 #include <unistd.h>
 #endif
 
-<<<<<<< HEAD
-#ifdef __unix__
-=======
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
->>>>>>> srb2/next
 #include <errno.h>
 #endif
 
@@ -146,87 +142,9 @@ int main(int argc, char **argv)
 		const char *reldir;
 		int left;
 		boolean fileabs;
-<<<<<<< HEAD
-		const char *link;
-
-		logdir = D_Home();
-
-		my_time = time(NULL);
-		timeinfo = localtime(&my_time);
-
-		if (M_CheckParm("-logfile") && M_IsNextParm())
-		{
-			format = M_GetNextParm();
-			fileabs = M_IsPathAbsolute(format);
-		}
-		else
-		{
-			format = "log-%Y-%m-%d_%H-%M-%S.txt";
-			fileabs = false;
-		}
-
-		if (fileabs)
-		{
-			strftime(logfilename, sizeof logfilename, format, timeinfo);
-		}
-		else
-		{
-			if (M_CheckParm("-logdir") && M_IsNextParm())
-				reldir = M_GetNextParm();
-			else
-				reldir = "logs";
-
-			if (M_IsPathAbsolute(reldir))
-			{
-				left = snprintf(logfilename, sizeof logfilename,
-						"%s"PATHSEP, reldir);
-			}
-			else
-#ifdef DEFAULTDIR
-			if (logdir)
-			{
-				left = snprintf(logfilename, sizeof logfilename,
-						"%s"PATHSEP DEFAULTDIR PATHSEP"%s"PATHSEP, logdir, reldir);
-			}
-			else
-#endif/*DEFAULTDIR*/
-			{
-				left = snprintf(logfilename, sizeof logfilename,
-						"."PATHSEP"%s"PATHSEP, reldir);
-			}
-#endif/*LOGMESSAGES*/
-
-			strftime(&logfilename[left], sizeof logfilename - left,
-					format, timeinfo);
-		}
-
-		M_MkdirEachUntil(logfilename,
-				M_PathParts(logdir) - 1,
-				M_PathParts(logfilename) - 1, 0755);
-
-#ifdef __unix__
-		logstream = fopen(logfilename, "w");
-#ifdef DEFAULTDIR
-		if (logdir)
-			link = va("%s/"DEFAULTDIR"/latest-log.txt", logdir);
-		else
-#endif/*DEFAULTDIR*/
-			link = "latest-log.txt";
-		unlink(link);
-		if (symlink(logfilename, link) == -1)
-		{
-			I_OutputMsg("Error symlinking latest-log.txt: %s\n", strerror(errno));
-		}
-#else/*__unix__*/
-		(void)link;
-		logstream = fopen("latest-log.txt", "wt+");
-#endif/*__unix__*/
-	}
-=======
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
 		const char *link;
 #endif
->>>>>>> srb2/next
 
 		logdir = D_Home();
 
@@ -342,4 +260,5 @@ int main(int argc, char **argv)
 	// return to OS
 	return 0;
 }
+
 #endif
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index b71eb5ae1..6350bbe35 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -137,11 +137,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 #include <errno.h>
 #endif
 
-<<<<<<< HEAD
 // Locations for searching for main.kart
-=======
-// Locations for searching the srb2.pk3
->>>>>>> srb2/next
 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON)
 #define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart"
 #define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart"
@@ -159,11 +155,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 
 /**	\brief WAD file to look for
 */
-<<<<<<< HEAD
 #define WADKEYWORD "main.kart"
-=======
-#define WADKEYWORD1 "srb2.pk3"
->>>>>>> srb2/next
 /**	\brief holds wad path
 */
 static char returnWadPath[256];
@@ -297,7 +289,6 @@ static void I_ReportSignal(int num, int coredumped)
 			sigmsg = 0;
 		else
 			sigmsg = msg;
-<<<<<<< HEAD
 	}
 
 	if (coredumped)
@@ -310,20 +301,6 @@ static void I_ReportSignal(int num, int coredumped)
 		sigmsg = msg;
 	}
 
-=======
-	}
-
-	if (coredumped)
-	{
-		if (sigmsg)
-			sprintf(msg, "%s (core dumped)", sigmsg);
-		else
-			strcat(msg, " (core dumped)");
-
-		sigmsg = msg;
-	}
-
->>>>>>> srb2/next
 	I_OutputMsg("\nProcess killed by signal: %s\n\n", sigmsg);
 
 	SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR,
@@ -2268,22 +2245,9 @@ void I_InitJoystick2(void)
 	if (M_CheckParm("-nojoy"))
 		return;
 
-<<<<<<< HEAD
 	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
 	{
 		CONS_Printf("I_InitJoystick2()...\n");
-=======
-	if (M_CheckParm("-noxinput"))
-		SDL_SetHintWithPriority("SDL_XINPUT_ENABLED", "0", SDL_HINT_OVERRIDE);
-
-	if (M_CheckParm("-nohidapi"))
-		SDL_SetHintWithPriority("SDL_JOYSTICK_HIDAPI", "0", SDL_HINT_OVERRIDE);
-
-	if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
-	{
-		CONS_Printf("I_InitJoystick2()...\n");
-
->>>>>>> srb2/next
 		if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) == -1)
 		{
 			CONS_Printf(M_GetText("Couldn't initialize joystick: %s\n"), SDL_GetError());
@@ -2401,6 +2365,7 @@ void I_InitJoystick4(void)
 		SDL_JoystickClose(newjoy);
 }
 
+
 static void I_ShutdownInput(void)
 {
 	// Yes, the name is misleading: these send neutral events to
@@ -3335,12 +3300,7 @@ void I_Error(const char *error, ...)
 	if (demo.recording)
 		G_CheckDemoStatus();
 	if (metalrecording)
-<<<<<<< HEAD
-		G_StopMetalRecording();
-#endif
-=======
 		G_StopMetalRecording(false);
->>>>>>> srb2/next
 
 	D_QuitNetGame();
 	M_FreePlayerSetupColors();
@@ -3419,11 +3379,7 @@ void I_RemoveExitFunc(void (*func)())
 	}
 }
 
-<<<<<<< HEAD
-#ifndef __unix__
-=======
 #if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
->>>>>>> srb2/next
 static void Shittycopyerror(const char *name)
 {
 	I_OutputMsg(
@@ -3437,26 +3393,16 @@ static void Shittylogcopy(void)
 {
 	char buf[8192];
 	FILE *fp;
-<<<<<<< HEAD
-	size_t n;
-=======
 	size_t r;
->>>>>>> srb2/next
 	if (fseek(logstream, 0, SEEK_SET) == -1)
 	{
 		Shittycopyerror("fseek");
 	}
 	else if (( fp = fopen(logfilename, "wt") ))
 	{
-<<<<<<< HEAD
-		while (( n = fread(buf, 1, sizeof buf, logstream) ))
-		{
-			if (fwrite(buf, 1, n, fp) < n)
-=======
 		while (( r = fread(buf, 1, sizeof buf, logstream) ))
 		{
 			if (fwrite(buf, 1, r, fp) < r)
->>>>>>> srb2/next
 			{
 				Shittycopyerror("fwrite");
 				break;
@@ -3473,11 +3419,7 @@ static void Shittylogcopy(void)
 		Shittycopyerror(logfilename);
 	}
 }
-<<<<<<< HEAD
-#endif/*__unix__*/
-=======
 #endif/*!(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))*/
->>>>>>> srb2/next
 
 //
 //  Closes down everything. This includes restoring the initial
@@ -3501,11 +3443,7 @@ void I_ShutdownSystem(void)
 	if (logstream)
 	{
 		I_OutputMsg("I_ShutdownSystem(): end of logstream.\n");
-<<<<<<< HEAD
-#ifndef __unix__
-=======
 #if !(defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON))
->>>>>>> srb2/next
 		Shittylogcopy();
 #endif
 		fclose(logstream);
@@ -3684,11 +3622,7 @@ static boolean isWadPathOk(const char *path)
 	if (!wad3path)
 		return false;
 
-<<<<<<< HEAD
 	sprintf(wad3path, pandf, path, WADKEYWORD);
-=======
-	sprintf(wad3path, pandf, path, WADKEYWORD1);
->>>>>>> srb2/next
 
 	if (FIL_ReadFileOK(wad3path))
 	{
@@ -3713,11 +3647,7 @@ static void pathonly(char *s)
 		}
 }
 
-<<<<<<< HEAD
 /**	\brief	search for main.kart in the given path
-=======
-/**	\brief	search for srb2.pk3 in the given path
->>>>>>> srb2/next
 
 	\param	searchDir	starting path
 
@@ -3741,15 +3671,10 @@ static const char *searchWad(const char *searchDir)
 	return NULL;
 }
 
-<<<<<<< HEAD
 /**	\brief go through all possible paths and look for main.kart
 
   \return path to main.kart if any
-=======
-/**	\brief go through all possible paths and look for srb2.pk3
 
-  \return path to srb2.pk3 if any
->>>>>>> srb2/next
 */
 static const char *locateWad(void)
 {
@@ -3878,11 +3803,7 @@ const char *I_LocateWad(void)
 
 	if (waddir)
 	{
-<<<<<<< HEAD
 		// change to the directory where we found main.kart
-=======
-		// change to the directory where we found srb2.pk3
->>>>>>> srb2/next
 #if defined (_WIN32)
 		SetCurrentDirectoryA(waddir);
 #else
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index af18b1cb0..be22b4c2b 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -65,10 +65,7 @@
 #include "../m_menu.h"
 #include "../d_main.h"
 #include "../s_sound.h"
-<<<<<<< HEAD
 #include "../i_sound.h"  	// midi pause/unpause
-=======
->>>>>>> srb2/next
 #include "../i_joy.h"
 #include "../st_stuff.h"
 #include "../hu_stuff.h"
@@ -365,8 +362,6 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 	return 0;
 }
 
-<<<<<<< HEAD
-=======
 static boolean IgnoreMouse(void)
 {
 	if (cv_alwaysgrabmouse.value)
@@ -380,7 +375,6 @@ static boolean IgnoreMouse(void)
 	return false;
 }
 
->>>>>>> srb2/next
 static void SDLdoGrabMouse(void)
 {
 	SDL_ShowCursor(SDL_DISABLE);
@@ -668,17 +662,10 @@ static void Impl_HandleWindowEvent(SDL_WindowEvent evt)
 	{
 		// Tell game we lost focus, pause music
 		window_notinfocus = true;
-<<<<<<< HEAD
 		if (!cv_playmusicifunfocused.value)
 			I_PauseSong();
 		if (!cv_playsoundifunfocused.value)
 			S_DisableSound();
-=======
-		if (! cv_playmusicifunfocused.value)
-			S_PauseAudio();
-		if (! cv_playsoundsifunfocused.value)
-			S_StopSounds();
->>>>>>> srb2/next
 
 		if (!disable_mouse)
 		{
@@ -1322,11 +1309,7 @@ void I_StartupMouse(void)
 	}
 	else
 		firsttimeonmouse = SDL_FALSE;
-<<<<<<< HEAD
-	if (cv_usemouse.value)
-=======
 	if (cv_usemouse.value && !IgnoreMouse())
->>>>>>> srb2/next
 		SDLdoGrabMouse();
 	else
 		SDLdoUngrabMouse();
@@ -1412,10 +1395,6 @@ static inline boolean I_SkipFrame(void)
 			if (!paused)
 				return false;
 			/* FALLTHRU */
-<<<<<<< HEAD
-=======
-		//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
->>>>>>> srb2/next
 		case GS_WAITINGPLAYERS:
 			return skip; // Skip odd frames
 		default:
@@ -1436,7 +1415,6 @@ void I_FinishUpdate(void)
 	if (I_SkipFrame())
 		return;
 
-<<<<<<< HEAD
 	if (st_overlay)
 	{
 		if (cv_ticrate.value)
@@ -1448,18 +1426,11 @@ void I_FinishUpdate(void)
 			SCR_DisplayLocalPing();
 		}
 	}
-=======
+
 	// draw captions if enabled
 	if (cv_closedcaptioning.value)
 		SCR_ClosedCaptions();
 
-	if (cv_ticrate.value)
-		SCR_DisplayTicRate();
->>>>>>> srb2/next
-
-	if (cv_showping.value && netgame && consoleplayer != serverplayer)
-		SCR_DisplayLocalPing();
-
 	if (rendermode == render_soft && screens[0])
 	{
 		SDL_Rect rect;
@@ -1736,11 +1707,6 @@ void VID_CheckGLLoaded(rendermode_t oldrender)
 			setrenderneeded = 0;
 		}
 	}
-<<<<<<< HEAD
-	//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
-
-	SDLSetMode(vid.width, vid.height, USE_FULLSCREEN);
-=======
 #endif
 }
 
@@ -1804,7 +1770,6 @@ void VID_CheckRenderer(void)
 	}
 
 	SDLSetMode(vid.width, vid.height, USE_FULLSCREEN, (rendererchanged ? SDL_FALSE : SDL_TRUE));
->>>>>>> srb2/next
 	Impl_VideoSetupBuffer();
 
 	if (rendermode == render_soft)
@@ -1814,8 +1779,6 @@ void VID_CheckRenderer(void)
 			SDL_FreeSurface(bufSurface);
 			bufSurface = NULL;
 		}
-<<<<<<< HEAD
-=======
 
 		if (rendererchanged)
 		{
@@ -1834,7 +1797,6 @@ void VID_CheckRenderer(void)
 			R_InitHardwareMode();
 			V_SetPalette(0);
 		}
->>>>>>> srb2/next
 	}
 #else
 	(void)oldrenderer;
@@ -1857,7 +1819,7 @@ INT32 VID_SetMode(INT32 modeNum)
 	vid.height = windowedModes[modeNum][1];
 	vid.modenum = modeNum;
 
-	//Impl_SetWindowName("SRB2 "VERSIONSTRING);
+	//Impl_SetWindowName("SRB2Kart "VERSIONSTRING);
 	VID_CheckRenderer();
 	return SDL_TRUE;
 }
@@ -1913,7 +1875,7 @@ static void Impl_SetWindowName(const char *title)
 static void Impl_SetWindowIcon(void)
 {
 	if (window && icoSurface)
-		SDL_SetWindowIcon(window, icoSurface);	
+		SDL_SetWindowIcon(window, icoSurface);
 }
 
 static void Impl_VideoSetupSDLBuffer(void)
@@ -1947,16 +1909,12 @@ static void Impl_VideoSetupSDLBuffer(void)
 static void Impl_VideoSetupBuffer(void)
 {
 	// Set up game's software render buffer
-<<<<<<< HEAD
-	//if (rendermode == render_soft)
-=======
 	vid.rowbytes = vid.width * vid.bpp;
 	vid.direct = NULL;
 	if (vid.buffer)
 		free(vid.buffer);
 	vid.buffer = calloc(vid.rowbytes*vid.height, NUMSCREENS);
 	if (!vid.buffer)
->>>>>>> srb2/next
 	{
 		I_Error("%s", M_GetText("Not enough memory for video buffer\n"));
 	}
@@ -2003,14 +1961,6 @@ void I_StartupGraphics(void)
 		))
 			framebuffer = SDL_TRUE;
 	}
-<<<<<<< HEAD
-	if (M_CheckParm("-software"))
-		rendermode = render_soft;
-#ifdef HWRENDER
-	else if (M_CheckParm("-opengl"))
-		rendermode = render_opengl;
-#endif
-=======
 
 #ifdef HWRENDER
 	if (M_CheckParm("-opengl"))
@@ -2018,7 +1968,6 @@ void I_StartupGraphics(void)
 	else if (M_CheckParm("-software"))
 #endif
 		chosenrendermode = rendermode = render_soft;
->>>>>>> srb2/next
 
 	usesdl2soft = M_CheckParm("-softblit");
 	borderlesswindow = M_CheckParm("-borderless");
@@ -2027,63 +1976,16 @@ void I_StartupGraphics(void)
 	VID_Command_ModeList_f();
 
 #ifdef HWRENDER
-<<<<<<< HEAD
-	if (rendermode == render_opengl)
-	{
-		HWD.pfnInit             = hwSym("Init",NULL);
-		HWD.pfnFinishUpdate     = NULL;
-		HWD.pfnDraw2DLine       = hwSym("Draw2DLine",NULL);
-		HWD.pfnDrawPolygon      = hwSym("DrawPolygon",NULL);
-		HWD.pfnSetBlend         = hwSym("SetBlend",NULL);
-		HWD.pfnClearBuffer      = hwSym("ClearBuffer",NULL);
-		HWD.pfnSetTexture       = hwSym("SetTexture",NULL);
-		HWD.pfnReadRect         = hwSym("ReadRect",NULL);
-		HWD.pfnGClipRect        = hwSym("GClipRect",NULL);
-		HWD.pfnClearMipMapCache = hwSym("ClearMipMapCache",NULL);
-		HWD.pfnSetSpecialState  = hwSym("SetSpecialState",NULL);
-		HWD.pfnSetPalette       = hwSym("SetPalette",NULL);
-		HWD.pfnGetTextureUsed   = hwSym("GetTextureUsed",NULL);
-		HWD.pfnDrawModel        = hwSym("DrawModel",NULL);
-		HWD.pfnCreateModelVBOs  = hwSym("CreateModelVBOs",NULL);
-		HWD.pfnSetTransform     = hwSym("SetTransform",NULL);
-		HWD.pfnPostImgRedraw    = hwSym("PostImgRedraw",NULL);
-		HWD.pfnFlushScreenTextures=hwSym("FlushScreenTextures",NULL);
-		HWD.pfnStartScreenWipe  = hwSym("StartScreenWipe",NULL);
-		HWD.pfnEndScreenWipe    = hwSym("EndScreenWipe",NULL);
-		HWD.pfnDoScreenWipe     = hwSym("DoScreenWipe",NULL);
-		HWD.pfnDrawIntermissionBG=hwSym("DrawIntermissionBG",NULL);
-		HWD.pfnMakeScreenTexture= hwSym("MakeScreenTexture",NULL);
-		HWD.pfnMakeScreenFinalTexture=hwSym("MakeScreenFinalTexture",NULL);
-		HWD.pfnDrawScreenFinalTexture=hwSym("DrawScreenFinalTexture",NULL);
-
-		HWD.pfnRenderSkyDome = hwSym("RenderSkyDome",NULL);
-
-		HWD.pfnLoadShaders = hwSym("LoadShaders",NULL);
-		HWD.pfnKillShaders = hwSym("KillShaders",NULL);
-		HWD.pfnSetShader = hwSym("SetShader",NULL);
-		HWD.pfnUnSetShader = hwSym("UnSetShader",NULL);
-
-		HWD.pfnLoadCustomShader = hwSym("LoadCustomShader",NULL);
-		HWD.pfnInitCustomShaders = hwSym("InitCustomShaders",NULL);
-
-		HWD.pfnStartBatching = hwSym("StartBatching",NULL);
-		HWD.pfnRenderBatches = hwSym("RenderBatches",NULL);
-
-		if (!HWD.pfnInit()) // load the OpenGL library
-			rendermode = render_soft;
-	}
-=======
 	if (M_CheckParm("-nogl"))
 		vid_opengl_state = -1; // Don't startup OpenGL
 	else if (chosenrendermode == render_opengl)
 		VID_StartupOpenGL();
->>>>>>> srb2/next
 #endif
 
 	// Window icon
 #ifdef HAVE_IMAGE
 	icoSurface = IMG_ReadXPMFromArray(SDL_icon_xpm);
-#endif	
+#endif
 
 	// Fury: we do window initialization after GL setup to allow
 	// SDL_GL_LoadLibrary to work well on Windows
diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 42797863a..9b41171db 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -816,8 +816,6 @@ static void mix_gme(void *udata, Uint8 *stream, int len)
 }
 #endif
 
-<<<<<<< HEAD
-=======
 #ifdef HAVE_OPENMPT
 static void mix_openmpt(void *udata, Uint8 *stream, int len)
 {
@@ -842,7 +840,6 @@ static void mix_openmpt(void *udata, Uint8 *stream, int len)
 }
 #endif
 
->>>>>>> srb2/next
 /// ------------------------
 /// Music System
 /// ------------------------
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index ef27cc26c..9600f66fa 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -98,13 +98,8 @@ boolean LoadGL(void)
 	{
 		CONS_Alert(CONS_ERROR, "Could not load OpenGL Library: %s\n"
 					"Falling back to Software mode.\n", SDL_GetError());
-<<<<<<< HEAD
 		if (!M_CheckParm("-OGLlib"))
 			CONS_Printf("If you know what is the OpenGL library's name, use -OGLlib\n");
-=======
-		if (!M_CheckParm ("-OGLlib"))
-			CONS_Alert(CONS_ERROR, "If you know what is the OpenGL library's name, use -OGLlib\n");
->>>>>>> srb2/next
 		return 0;
 	}
 
@@ -135,23 +130,14 @@ boolean LoadGL(void)
 		else
 		{
 			CONS_Alert(CONS_ERROR, "Could not load GLU Library: %s\n", GLULibname);
-<<<<<<< HEAD
 			if (!M_CheckParm("-GLUlib"))
 				CONS_Printf("If you know what is the GLU library's name, use -GLUlib\n");
-=======
-			if (!M_CheckParm ("-GLUlib"))
-				CONS_Alert(CONS_ERROR, "If you know what is the GLU library's name, use -GLUlib\n");
->>>>>>> srb2/next
 		}
 	}
 	else
 	{
 		CONS_Alert(CONS_ERROR, "Could not load GLU Library\n");
-<<<<<<< HEAD
-		CONS_Printf("If you know what is the GLU library's name, use -GLUlib\n");
-=======
-		CONS_Alert(CONS_ERROR, "If you know what is the GLU library's name, use -GLUlib\n");
->>>>>>> srb2/next
+		CONS_Printf("If you know what is the GLU library's name, use -GLUlib\n");;
 	}
 #endif
 	return SetupGLfunc();
@@ -235,11 +221,7 @@ void OglSdlFinishUpdate(boolean waitvbl)
 	HWR_DrawScreenFinalTexture(realwidth, realheight);
 }
 
-<<<<<<< HEAD
-EXPORT void HWRAPI(OglSdlSetPalette) (RGBA_t *palette, RGBA_t *pgamma)
-=======
 EXPORT void HWRAPI( OglSdlSetPalette) (RGBA_t *palette)
->>>>>>> srb2/next
 {
 	size_t palsize = (sizeof(RGBA_t) * 256);
 	// on a palette change, you have to reload all of the textures