Merge conflict added

Assets/Scenes/SampleScene.unity

@@ -434,9 +434,21 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalPosition.y
@@ -448,31 +460,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.99988645
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: 0.008802043
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 0.008649743
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: 0.008649744
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2548316758341537879, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6491447761962638520, guid: 3ed136cd438ca436f87e316bc3308287, type: 3}
       propertyPath: m_Name