diff --git a/src/cacio-e-pepe.md b/src/cacio-e-pepe.md
index 0e4931f..306b021 100644
--- a/src/cacio-e-pepe.md
+++ b/src/cacio-e-pepe.md
@@ -2,21 +2,13 @@
 
 ![pepe](pix/cacio-e-pepe.webp)
 
-<<<<<<< HEAD
 Cacio e Pepe (meaning cheese and pepper) is not only based but also incredibly simple, ideal for lazy neets and similarly minded people who don't want to wash too many dishes and don't like complicated recipes with too many extra ingredients.
-=======
-Cacio e Pepe (meaning cheese and pepper) is not only based but also incredibly simple, ideal for lazy neets and similarly minded people
-who don't want to wash too many dishes and don't like complicated recipes with too many extra ingredients.
->>>>>>> 13ce3f197272544f07f2a74c6b29d6a1c280d703
 
 ## Ingredients
 
 - Spaghetti (recipe works with pretty much any type)
-<<<<<<< HEAD
 - Grated Parmasean Cheese (or something similar, pic above uses parmasean and fresh mozzarella)
-=======
 - Grated Parmesan Cheese (or something similar)
->>>>>>> 13ce3f197272544f07f2a74c6b29d6a1c280d703
 
 ## Directions
 
@@ -33,4 +25,4 @@ Pasta water and the cheese are already salty, so you may not need to add any ext
 ## Contributors
 
 - Some guy called [siedes](https://github.com/siedes)
-- Batu Cam -- Added picture -- XMR: 85eZ4uVd4gkiCsQEeDnsQG9pUbDzdi1r1VSJ9hK5Sx7hKsFZjvmqtWV7gU1ysWUR32jhWutBRGUUq8VAJNUfin9wBCCuTdg
\ No newline at end of file
+- Batu Cam -- Added picture -- XMR: 85eZ4uVd4gkiCsQEeDnsQG9pUbDzdi1r1VSJ9hK5Sx7hKsFZjvmqtWV7gU1ysWUR32jhWutBRGUUq8VAJNUfin9wBCCuTdg