diff --git a/dishes/home-cooking/老式锅包肉/老式锅包肉.md b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
index 7d1a89a0..bca8a776 100644
--- a/dishes/home-cooking/老式锅包肉/老式锅包肉.md
+++ b/dishes/home-cooking/老式锅包肉/老式锅包肉.md
@@ -7,7 +7,10 @@
 
 ## 必备原料和工具
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 745f47d114341517dad600e52edda3bd3d1ef070
 - 里脊肉
 - 大葱
 - 姜
diff --git a/tips/.DS_Store b/tips/.DS_Store
new file mode 100644
index 000000000..12217018
Binary files /dev/null and b/tips/.DS_Store differ