diff --git a/01/01.txt b/01/01.txt
index 3b1c452..0f783a6 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 Noemí Sampedro
-=======
-\c 1 \v 1 \v 2 \v 3
->>>>>>> a1816138c282404b1e8909d7edf0514dbf3e8c2d
+\c 1 \v 1 \v 2 \v 3
\ No newline at end of file
diff --git a/01/04.txt b/01/04.txt
deleted file mode 100644
index c3086a8..0000000
--- a/01/04.txt
+++ /dev/null
@@ -1 +0,0 @@
-\v 4 hola  \v 5 hola  com va \v 6 hola
\ No newline at end of file