merge fixes and icebolt tweaks

Assets/Project Files/Prefabs/JonasB/IceBolt.prefab

@@ -4834,7 +4834,6 @@ GameObject:
   - component: {fileID: 3928666337405863709}
   - component: {fileID: 824121554007831541}
   - component: {fileID: 3271421586109646936}
-  - component: {fileID: 6090694805862981561}
   - component: {fileID: 6268334591715512481}
   - component: {fileID: 7195648623186244198}
   m_Layer: 10
@@ -4901,19 +4900,6 @@ SphereCollider:
   serializedVersion: 2
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!135 &6090694805862981561
-SphereCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3928666337405863711}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Radius: 0.5
-  m_Center: {x: 0, y: 0, z: 0}
 --- !u!33 &6268334591715512481
 MeshFilter:
   m_ObjectHideFlags: 0