diff --git a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
index 0bd55054..b505e5d5 100644
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
@@ -13,7 +13,6 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-<<<<<<< HEAD
   - 1010
   - 1005
   - 1010
@@ -39,4 +38,3 @@ MonoBehaviour:
   - 2032
   - 2001
   - 2019
->>>>>>> origin/dev-1217