Merging fixes

Assets/Prefabs/GameManager.prefab

@@ -11,6 +11,7 @@ GameObject:
   - component: {fileID: 1739828243584991408}
   - component: {fileID: 1739828243584991409}
   - component: {fileID: 7009192361258235585}
+  - component: {fileID: 1668867271683391002}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -60,6 +61,7 @@ MonoBehaviour:
   min_y_offset: 0.5
   last_platform_height: 0
   IncreaseDistance: 0.05
+  IncreaseOwlSpeed: 0.05
   IncreaseOnkoltsegSpeed: 0.05
   DeIncreaseOnkoltsegTime: 0.025
   OnkoltsegController: {fileID: 0}
@@ -79,8 +81,27 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   chanceToSpawnSpecial: 0.2
-  chanceToSpawnCoin: 0.6
   maxSpecialNum: 3
   minSpecialNum: 0
+  specialItems: []
+  chanceToSpawnCoin: 0.6
   maxCoinNum: 5
   minCoinNum: 1
+  coinPrefab: {fileID: 0}
+  minCoinValue: 50
+  maxCoinValue: 500
+--- !u!114 &1668867271683391002
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1739828243584991410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76e401c1083713d4891fdd07806c39d8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  owlPrefab: {fileID: 0}
+  enemySpawningOffset: 0
+  ySpawningOffset: 0

Assets/Scenes/Platform_spawning.unity

@@ -625,6 +625,18 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 1668867271683391002, guid: 55d2f14dee4db49449ae72330c148985, type: 3}
+      propertyPath: owlPrefab
+      value: 
+      objectReference: {fileID: 4801316083981629696, guid: 397a87147f92f034fb2b031ffe8e210a, type: 3}
+    - target: {fileID: 1668867271683391002, guid: 55d2f14dee4db49449ae72330c148985, type: 3}
+      propertyPath: ySpawningOffset
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1668867271683391002, guid: 55d2f14dee4db49449ae72330c148985, type: 3}
+      propertyPath: enemySpawningOffset
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 1739828243584991408, guid: 55d2f14dee4db49449ae72330c148985, type: 3}
       propertyPath: m_RootOrder
       value: 0