diff --git a/Quake/cl_main.c b/Quake/cl_main.c
index 79e4e412..4eea2c56 100644
--- a/Quake/cl_main.c
+++ b/Quake/cl_main.c
@@ -1813,13 +1813,10 @@ qboolean CL_CheckDownload(const char *filename)
 		return false;	//don't download these...
 	if (cls.download.active)
 		return true;	//block while we're already downloading something
-<<<<<<< HEAD
-=======
 	if (!cl.protocol_dpdownload)
 		return false;	//can't download anyway
 	if (cl.wronggamedir)
 		return false;	//don't download them into the wrong place. this may be awkward for id1 content though (if such a thing logically exists... like custom maps).
->>>>>>> upstream/qsrebase
 	if (*cls.download.current && !strcmp(cls.download.current, filename))
 		return false;	//if the previous download failed, don't endlessly retry.
 	if (COM_FileExists(filename, NULL))