diff --git a/Assets/.DS_Store b/Assets/.DS_Store
index 837018b..fa89f95 100644
Binary files a/Assets/.DS_Store and b/Assets/.DS_Store differ
diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab
index fcc0485..e1a6b85 100644
--- a/Assets/Prefabs/Bones.prefab
+++ b/Assets/Prefabs/Bones.prefab
@@ -271,8 +271,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   terminalVelocity: -15
-<<<<<<< Updated upstream
-=======
 --- !u!111 &6769589999303328011
 Animation:
   m_ObjectHideFlags: 0
@@ -303,10 +301,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   blockArea: {fileID: 4413221056628714154}
   blocking: 0
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
 --- !u!1 &1648017802882051395
 GameObject:
   m_ObjectHideFlags: 0