diff --git a/01/01.txt b/01/01.txt
index d7830ac..4b18696 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 3 paco \v 2 :)
-=======
-\c 1 \v 1 \v 2 \v 3 Noemí Sampedro
->>>>>>> 1bf175ef7febf17baaf754861971e360dd89651f
+\c 1 \v 1 \v 3 paco \v 2 :)
\ No newline at end of file
diff --git a/01/04.txt b/01/04.txt
index c14a0f0..51c48d3 100644
--- a/01/04.txt
+++ b/01/04.txt
@@ -1 +1 @@
-\v 4 3kihiuhouojmop. \v 6 \v 5 ikhiuojokjopij.   iuhnoinmomp
\ No newline at end of file
+\v 4 \v 5 \v 6 \v
\ No newline at end of file