diff --git a/Assets/InputSystem.inputsettings.asset.meta b/Assets/InputSystem.inputsettings.asset.meta
index cf06e9d..060f02f 100644
--- a/Assets/InputSystem.inputsettings.asset.meta
+++ b/Assets/InputSystem.inputsettings.asset.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 1077cbc74ab0dc44eb42f9a1f2b90a2a
+=======
+guid: 5b0ac5f58f6660143aa0c32c9a8b5cd6
+>>>>>>> a793f4050f8fdc97ae8cf50a86f7455459abab35
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta
new file mode 100644
index 0000000..3fab0a4
--- /dev/null
+++ b/Assets/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b0b078695a428d149955457491a4eaa8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Script.meta b/Assets/Script.meta
new file mode 100644
index 0000000..da274dd
--- /dev/null
+++ b/Assets/Script.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 53298ad6cc631f6478a600a8646ebf59
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index f37bce7..d610f7b 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -23,11 +23,16 @@ EditorUserSettings:
     RecentlyUsedScenePath-5:
       value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
+<<<<<<< HEAD
     RecentlyUsedScenePath-6:
       value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
       flags: 0
     RecentlyUsedScenePath-7:
       value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb
+=======
+    RecentlyUsedScenePath-1:
+      value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
+>>>>>>> a793f4050f8fdc97ae8cf50a86f7455459abab35
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650