merge fix

Assets/Prefabs/Camera.prefab

@@ -90,7 +90,7 @@ MonoBehaviour:
     FieldOfView: 60.000004
     OrthographicSize: 5
     NearClipPlane: 0.3
-    FarClipPlane: 1000
+    FarClipPlane: 500
     Dutch: 0
     ModeOverride: 0
     LensShift: {x: 0, y: 0}
@@ -163,17 +163,17 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: bd6043bde05a7fc4cba197d06915c1e3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Damping: {x: 5, y: 0.5, z: 1.5}
-  ShoulderOffset: {x: 0, y: 2, z: 0}
+  Damping: {x: 4, y: 0.4, z: 1}
+  ShoulderOffset: {x: 0, y: 1.75, z: 0}
   VerticalArmLength: 0.4
-  CameraSide: 1
+  CameraSide: 0.5
   CameraDistance: 5
   CameraCollisionFilter:
     serializedVersion: 2
     m_Bits: 0
   IgnoreTag: 
   CameraRadius: 0.5
-  DampingIntoCollision: 0
+  DampingIntoCollision: 4.6
   DampingFromCollision: 2
 --- !u!114 &7119497487385811357
 MonoBehaviour:
@@ -214,8 +214,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5810170567460595970}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.22189745, y: -0, z: -0, w: 0.97507}
-  m_LocalPosition: {x: 6.063599, y: 1.029345, z: -2.1784945}
+  m_LocalRotation: {x: 0.20165665, y: -0, z: -0, w: 0.9794563}
+  m_LocalPosition: {x: 6.063599, y: 0.77934504, z: -2.1784945}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -253,7 +253,7 @@ Camera:
     width: 1
     height: 1
   near clip plane: 0.3
-  far clip plane: 1000
+  far clip plane: 500
   field of view: 60.000004
   orthographic: 0
   orthographic size: 5