diff --git a/20/reference.txt b/20/reference.txt
index 14591da..d51d42c 100644
--- a/20/reference.txt
+++ b/20/reference.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Una historia Bíblica de 2 Reyes 17; 24-25  2 Crónicas 36; Esdras 1 '10; Nehemías 1-13
-=======
-Una historia de la Biblia de: 2 Reyes 17; 24-25; 2 Crónicas 36; Esdras 1-10; Nehemias 1-13
->>>>>>> 9ec7593bc40e0e155b09a23abacd4d192bbe8767
+Una historia Bíblica de 2 Reyes 17; 24-25  2 Crónicas 36; Esdras 1 '10; Nehemías 1-13
\ No newline at end of file