diff --git a/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab b/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
index 5c18f8c..fe2e0be 100644
--- a/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
+++ b/Assets/Prefabs/Monsters/ClawClawRough_monster.prefab
@@ -106,7 +106,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
@@ -577,10 +577,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _entity: {fileID: 313037212318601125}
   _projectile: {fileID: 0}
-<<<<<<< HEAD
-=======
   _projectileSpawn: {fileID: 0}
->>>>>>> 15f95d5bc42cf539dec3594a03d46606fe9ae84f
 --- !u!1 &1776168629768863343
 GameObject:
   m_ObjectHideFlags: 0
@@ -2399,4 +2396,4 @@ Transform:
   - {fileID: 7904268804006905921}
   m_Father: {fileID: 4594931196062474192}
   m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
\ No newline at end of file
diff --git a/Assets/Prefabs/Sticks/baseStick.prefab b/Assets/Prefabs/Sticks/baseStick.prefab
index 4ddbb8e..d038367 100644
--- a/Assets/Prefabs/Sticks/baseStick.prefab
+++ b/Assets/Prefabs/Sticks/baseStick.prefab
@@ -511,7 +511,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 1
+  m_IsTrigger: 0
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
@@ -749,10 +749,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _entity: {fileID: 8585520847943034727}
   _projectile: {fileID: 0}
-<<<<<<< HEAD:Assets/Prefabs/baseStick.prefab
-=======
   _projectileSpawn: {fileID: 0}
->>>>>>> 15f95d5bc42cf539dec3594a03d46606fe9ae84f:Assets/Prefabs/Sticks/baseStick.prefab
 --- !u!1 &6962989255885988245
 GameObject:
   m_ObjectHideFlags: 0
@@ -1270,4 +1267,4 @@ Transform:
   - {fileID: 6962989255305957540}
   m_Father: {fileID: 6962989255883535387}
   m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
\ No newline at end of file