diff --git a/Assets/Scenes/Collision.unity b/Assets/Scenes/Collision.unity
index 5c2ef1a..e014b3a 100644
--- a/Assets/Scenes/Collision.unity
+++ b/Assets/Scenes/Collision.unity
@@ -156,11 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   springCoefficient: 100
-<<<<<<< Updated upstream
   dampingCoefficient: 1
-=======
-  dampingCoefficient: 0
->>>>>>> Stashed changes
   HalfSideLength: 20
   FixPos: 3
   mass: 10