diff --git a/project.godot b/project.godot
index b2ee023..b8c2731 100644
--- a/project.godot
+++ b/project.godot
@@ -15,13 +15,10 @@ run/main_scene="uid://bxf4x8hp870i6"
 config/features=PackedStringArray("4.4", "Forward Plus")
 config/icon="res://icon.svg"
 
-<<<<<<< HEAD
-=======
 [dotnet]
 
 project/assembly_name="Revenge of the Red Dragon Pon of the Red Dragon Pon of the Red Dragon Pon"
 
->>>>>>> 3a70d2a (Enemy directional sprite)
 [rendering]
 
 textures/canvas_textures/default_texture_filter=0