diff --git a/dishes/home-cooking/老式锅包肉/老式锅包肉.md b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
index bca8a77..9280aff 100644
--- a/dishes/home-cooking/老式锅包肉/老式锅包肉.md
+++ b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
@@ -7,10 +7,6 @@
 
 ## 必备原料和工具
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 745f47d114341517dad600e52edda3bd3d1ef070
 - 里脊肉
 - 大葱
 - 姜