diff --git a/guacamole.md b/guacamole.md
index 899c27e..ae48c5f 100644
--- a/guacamole.md
+++ b/guacamole.md
@@ -1,11 +1,20 @@
 # Recipe for Guacamole
-Serves 4
+Serves 10
 
+<<<<<<< HEAD
 - 3 avocados, ripe
 - 0.5 small yellow onion, finely diced
 - 2 Roma tomatoes, diced
 - 3 tablespoons finely chopped fresh cilantro
-- 1 jalapeno pepper, seeds removed and finely diced
 - 2 garlic cloves, minced
 - 1 lime, juiced
 - 0.5 teaspoon sea salt
+=======
+- 9 avocados, ripe
+- 1.5 small yellow onion, finely diced
+- 6 Roma tomatoes, diced
+- 9 tablespoons finely chopped fresh cilantro
+- 6 garlic cloves, minced
+- 3 lime, juiced
+- 1.5 teaspoon sea salt
+>>>>>>> ee5680b7bdd354aef34edb359aa503074e841ee3