diff --git a/assets/first_party/tiles/Wood_Walls.png b/assets/first_party/tiles/Wood_Walls.png
deleted file mode 100644
index 6a23c7d507..0000000000
--- a/assets/first_party/tiles/Wood_Walls.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8bb124f62cf325b4bf92a53fbf7d03233b8a9bbaf41ca0f3dc9f23d07e529256
-size 36615
diff --git a/assets/first_party/tiles/Wood_Walls.png.import b/assets/first_party/tiles/Wood_Walls.png.import
deleted file mode 100644
index 1289e7da01..0000000000
--- a/assets/first_party/tiles/Wood_Walls.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cvgu3ba5aqd8i"
-path="res://.godot/imported/Wood_Walls.png-88768bac07ce08d0a8ec393bc58897a0.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/first_party/tiles/Wood_Walls.png"
-dest_files=["res://.godot/imported/Wood_Walls.png-88768bac07ce08d0a8ec393bc58897a0.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
diff --git a/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import b/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import
index 68f8d43419..af9567d160 100644
--- a/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import
+++ b/scenes/quests/story_quests/verso/assets/Wood_Walls.png.import
@@ -2,11 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-<<<<<<< Updated upstream
-uid="uid://cvgu3ba5aqd8i"
-=======
-uid="uid://b8mvwua51wbd4"
->>>>>>> Stashed changes
+uid="uid://c5jwngf36wn0i"
 path="res://.godot/imported/Wood_Walls.png-1e9fd772383acd42daf6957b52caa3e1.ctex"
 metadata={
 "vram_texture": false