diff --git a/Viagg-io/ProjectSettings/EditorBuildSettings.asset b/Viagg-io/ProjectSettings/EditorBuildSettings.asset
index a2e6f25..7cdd6a3 100644
--- a/Viagg-io/ProjectSettings/EditorBuildSettings.asset
+++ b/Viagg-io/ProjectSettings/EditorBuildSettings.asset
@@ -5,14 +5,6 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-<<<<<<< HEAD
-  - enabled: 0
-    path: Assets/Scenes/Test-Scene-Nick-Handmenu.unity
-    guid: 3b4a6e5db0165e344b220fcfbfe68836
-  - enabled: 1
-    path: Assets/Scenes/Test-Scene-Nick-Zwiebelhacken.unity
-    guid: 86afdeefd7cdf934d9c4db691f96a878
-=======
   - enabled: 1
     path: Assets/Scenes/1.0-SBB.unity
     guid: 6a1144d40bbf04513a9929856271d4e7
@@ -25,7 +17,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/3.2-Grotto.unity
     guid: 73660f1e1eb0e524fb6b6f42ca2c7b54
->>>>>>> master
   m_configObjects:
     Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2}