diff --git a/src/js/vectorRevampedArtControlJS.tw b/src/js/vectorRevampedArtControlJS.tw
index 616afc0d99aa23e0ce8181de6a4bdf3a03491a82..2017d7345d2c050ad974d17a1c642b5e921abcac 100644
--- a/src/js/vectorRevampedArtControlJS.tw
+++ b/src/js/vectorRevampedArtControlJS.tw
@@ -246,12 +246,7 @@ class ArtStyleControl {
 			["dyed green", "#A6C373"],
 			["blue dyed", "#5b8eb7"],
 			["dyed blue", "#5b8eb7"],
-<<<<<<< HEAD
 			["tiger striped", "#e2d75d"]
-=======
-			["tiger striped", "#e2d75d"],
-			["olive", "#a46237"]
->>>>>>> pregmod-master
 		];
 		
 		var skinPaletteMap = new Map(skinPalette);