resolved conflicts

ProjectSettings/EditorBuildSettings.asset

@@ -38,6 +38,21 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Main Screen Scenes/bubak.unity
     guid: 2ac55b32f60c0f44691e1588d19d610f
+  - enabled: 1
+    path: Assets/Scenes/Kabely/MiniGame-Kabely V10.unity
+    guid: ae701dd46572ae44faa1c08754c677a1
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-insertkeys.unity
+    guid: a9886d0962880e14fb8072fee41dc9b5
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-FlappyBird.unity
+    guid: 15742d157dfd1e42fb34ae90434eee41
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-ThrowInHole.unity
+    guid: d34a25fb4e1abb111a62c1802c0477d4
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-Satelit.unity
+    guid: 070c4a89027b6e9a28e16859d55f8c66
   m_configObjects:
     com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
   m_UseUCBPForAssetBundles: 0

ProjectSettings/ProjectSettings.asset

@@ -920,7 +920,7 @@ PlayerSettings:
   qnxGraphicConfPath: 
   apiCompatibilityLevel: 6
   captureStartupLogs: {}
-  activeInputHandler: 2
+  activeInputHandler: 0
   windowsGamepadBackendHint: 0
   cloudProjectId: 
   framebufferDepthMemorylessMode: 0

ProjectSettings/ProjectSettings/EditorBuildSettings.asset

@@ -0,0 +1,58 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/SampleScene.unity
+    guid: 8afa6ce05eb7dba4c894b910786e3baf
+  - enabled: 1
+    path: Assets/Scenes/Client.unity
+    guid: 99349b837685d91408e5eb5bac237678
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host a join.unity
+    guid: 7555f1f2ac99b4e4f8a21ad9ca5fc1dc
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/host lobby.unity
+    guid: 2abd1bf51796b0c4ea1347cfd0f5351f
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join lobby.unity
+    guid: e316ab15407b8d84e96f5b26750db7c6
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/join loading.unity
+    guid: 79aa29a53fbe19d4bbd18b84efde5167
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/create.unity
+    guid: bb0f4b90bb4ebfe47b92da609060694b
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/main menu asi idk lol.unity
+    guid: af78c9ede2fc9c04e9413136f76a9996
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/are u sure.unity
+    guid: 42774ddf02ffd1747898d12625c667b0
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/aus hrac.unity
+    guid: 60b609405d1182342a835866a25ce8ae
+  - enabled: 1
+    path: Assets/Scenes/Main Screen Scenes/bubak.unity
+    guid: 2ac55b32f60c0f44691e1588d19d610f
+  - enabled: 1
+    path: Assets/Scenes/Kabely/MiniGame-Kabely V10.unity
+    guid: ae701dd46572ae44faa1c08754c677a1
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-insertkeys.unity
+    guid: a9886d0962880e14fb8072fee41dc9b5
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-FlappyBird.unity
+    guid: 15742d157dfd1e42fb34ae90434eee41
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-ThrowInHole.unity
+    guid: d34a25fb4e1abb111a62c1802c0477d4
+  - enabled: 1
+    path: Assets/Scenes/MiniGame-Satelit.unity
+    guid: 070c4a89027b6e9a28e16859d55f8c66
+  m_configObjects:
+    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
+  m_UseUCBPForAssetBundles: 0