diff --git a/README.md b/README.md
index 8babef95..21d7432b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
 Ir a `/arturito`.
+<<<<<<< HEAD
+prueba caca 2
+=======
 
+>>>>>>> parent of e25d196 (prueba de caca)
 
 **Maintainer:** @MartinCura
\ No newline at end of file