diff --git a/Content/map/map_BuiltData.uasset b/Content/map/map_BuiltData.uasset
deleted file mode 100644
index d486b6bf..00000000
Binary files a/Content/map/map_BuiltData.uasset and /dev/null differ
diff --git a/SXD_2v.uproject b/SXD_2v.uproject
index 4da71cbf..a97f9cbc 100644
--- a/SXD_2v.uproject
+++ b/SXD_2v.uproject
@@ -1,6 +1,10 @@
 {
 	"FileVersion": 3,
+<<<<<<< HEAD
+	"EngineAssociation": "5.3",
+=======
 	"EngineAssociation": "5.5",
+>>>>>>> 81b4a818e8005f6f2f7c9318c0c8eff35872e5b6
 	"Category": "",
 	"Description": "",
 	"Modules": [