diff --git a/menus/palette_select.tscn b/menus/palette_select.tscn
index 12cf6c6..82db342 100644
--- a/menus/palette_select.tscn
+++ b/menus/palette_select.tscn
@@ -15,15 +15,9 @@
 [ext_resource path="res://graphics/player/palettes/trans_pride.tex" type="Texture" id=13]
 [ext_resource path="res://graphics/player/palettes/supersonic.tex" type="Texture" id=14]
 [ext_resource path="res://menus/level_select_scholar.tscn" type="PackedScene" id=15]
-<<<<<<< HEAD
-[ext_resource path="res://graphics/player/palettes/cosmological_redshift.png" type="Texture" id=16]
-[ext_resource path="res://graphics/player/palettes/gravitational_redshift.png" type="Texture" id=17]
-[ext_resource path="res://graphics/player/palettes/elaine.tex" type="Texture" id=18]
-=======
 [ext_resource path="res://graphics/player/palettes/cosmological_redshift.tex" type="Texture" id=16]
 [ext_resource path="res://graphics/player/palettes/msx.tex" type="Texture" id=17]
 [ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=18]
->>>>>>> 9c1f521 (more palettes)
 
 [sub_resource type="ShaderMaterial" id=1]
 shader = ExtResource( 1 )