diff --git a/engine/code/cgame/cg_rally_hud.c b/engine/code/cgame/cg_rally_hud.c
index ca7854c0..1978d03f 100644
--- a/engine/code/cgame/cg_rally_hud.c
+++ b/engine/code/cgame/cg_rally_hud.c
@@ -422,16 +422,9 @@ static float CG_DrawTimes( float y ) {
 		
 		Com_sprintf(s, sizeof(s), "B: %s", time);
 //		x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
-<<<<<<< HEAD
-        x = 636 - 80;
-		CG_FillRect ( x  + cg_wideoffset.integer, y, 90, 18, bgColor );
-		x+= 10;
-=======
         x = 636 - 120;
 		CG_FillRect ( x, y, 120, 18, bgColor );
-		x+= 25;
->>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
-		
+		x+= 25;		
 		y+= 4;
 		CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
 		y += TINYCHAR_HEIGHT + 4;
@@ -448,16 +441,9 @@ static float CG_DrawTimes( float y ) {
 
 		Com_sprintf(s, sizeof(s), "L: %s", time);
 //		x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
-<<<<<<< HEAD
-        x = 636 - 80;
-        CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
-        x+= 10;
-=======
         x = 636 - 120;
         CG_FillRect( x, y, 120, 18, bgColor );
         x+= 25;
->>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
-    
         y+= 4;
 		CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
 		y += TINYCHAR_HEIGHT + 4;
@@ -481,16 +467,9 @@ static float CG_DrawTimes( float y ) {
 
 	Com_sprintf(s, sizeof(s), "T: %s", time);
 
-<<<<<<< HEAD
-	x = 636 - 80;
-	CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
-	x += 10;
-=======
 	x = 636 - 120;
 	CG_FillRect( x, y, 120, 18, bgColor );
 	x += 25;
->>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
-
 	y += 4;
 	CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
 	y += TINYCHAR_HEIGHT + 4;
@@ -522,16 +501,9 @@ static float CG_DrawLaps( float y ) {
 
 	Com_sprintf(s, sizeof(s), "LAP: %i/%i", curLap, numLaps);
 
-<<<<<<< HEAD
-	x = 636 - 80;
-	CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
-	x += 10;
-=======
 	x = 636 - 120;
 	CG_FillRect( x, y, 120, 18, bgColor );
 	x += 25;
->>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
-
 	y += 4;
 	CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
 	y += TINYCHAR_HEIGHT + 4;
@@ -573,15 +545,9 @@ static float CG_DrawCurrentPosition( float y ) {
 
 	x += TINYCHAR_WIDTH * 5;
 
-<<<<<<< HEAD
-	CG_DrawTinyDigitalStringColor( x + cg_wideoffset.integer, y, va("%i/%i", pos, cgs.numRacers), colorWhite);
-    
-	y += 20;
-=======
 	CG_DrawTinyDigitalStringColor( x, y, va("%i/%i", pos, cgs.numRacers), colorWhite);
 
 	y += 10 + 4;
->>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
 
 	return y;
 }
@@ -936,7 +902,7 @@ float CG_DrawUpperRightHUD( float y ) {
 		}
 		else if (cgs.gametype == GT_DERBY)
 			y = CG_DrawTimes( y );
-// 0.0.4.0
+// 0.5
 //			CG_DrawHUD_DerbyList(44, 130);
 			
 	}
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index c4181f9e..49d14361 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.4_r491"   
+#define PRODUCT_VERSION "v0.4_r493"   
 #endif
 
 
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index 00cbb3fc..04b43c2c 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -894,7 +894,7 @@ q3rallycode
 6=engine\code\cgame\cg_draw.c
 [Selected Project Files]
 Main=
-Selected=engine\code\cgame\cg_draw.c
+Selected=engine\code\cgame\cg_rally_hud.c
 [engine\code\qcommon\q_shared.h]
 TopLine=58
 Caret=35,70
@@ -908,11 +908,11 @@ Caret=77,440
 TopLine=90
 Caret=79,106
 [engine\code\cgame\cg_rally_hud.c]
-TopLine=931
-Caret=1,1
+TopLine=525
+Caret=14,550
 [engine\code\cgame\cg_rally_hud2.c]
-TopLine=335
+TopLine=378
 Caret=33,422
 [engine\code\cgame\cg_draw.c]
-TopLine=1
+TopLine=3052
 Caret=3,3095