diff --git a/src/r_draw.c b/src/r_draw.c
index a0460e72c..82040afe3 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -144,12 +144,8 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
 #define DEFAULT_STARTTRANSCOLOR 96
 #define NUM_PALETTE_ENTRIES 256
 
-<<<<<<< HEAD
 static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL};
-=======
-static UINT8** translationtablecache[MAXSKINS + 7] = {NULL};
 UINT8 skincolor_modified[MAXSKINCOLORS];
->>>>>>> srb2/next
 
 CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];