diff --git a/engine/code/cgame/cg_servercmds.c b/engine/code/cgame/cg_servercmds.c
index a504fa63..f58bcbff 100644
--- a/engine/code/cgame/cg_servercmds.c
+++ b/engine/code/cgame/cg_servercmds.c
@@ -284,8 +284,6 @@ void CG_SetConfigValues( void ) {
 		s = CG_ConfigString( CS_FLAGSTATUS );
 		cgs.redflag = s[0] - '0';
 		cgs.blueflag = s[1] - '0';
-        cgs.greenflag = s[2] - '0';
-        cgs.yellowflag = s[3] - '0';
 	}
 
 	else if ( cgs.gametype == GT_DOMINATION ) {
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index e2b44ab2..01922ad0 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -70,23 +70,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-#define PRODUCT_VERSION "v0.5 r607"
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r605"
->>>>>>> parent of c9856b0d (prepare new Gametype 4-Teams-CTF)
-=======
-#define PRODUCT_VERSION "v0.5 r607"
->>>>>>> 4347bd4648d9315f81c43fe093cb4a6b6ef8a030
+#define PRODUCT_VERSION "v0.5 (r613)"
 #endif
 
 
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index f237ab0e..a47ae9f1 100644
Binary files a/q3rallycode.ppr and b/q3rallycode.ppr differ