diff --git a/01/13.txt b/01/13.txt
index 4984440b..3d334252 100644
--- a/01/13.txt
+++ b/01/13.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Masqan Ğ'mertma adami çrma zilit daazina.Raxanats magar zilşi  ig'o gamayg'a  magigni er neqni magit gaaçina dedaqaci da s'ovg'ona adams.
-=======
-Masqan G'mertma aadami çrma zilit daazina.Raxanats magar zilşi  ig'o gamaig'a  magigni er neqni magit gaaçina dedaqaci da s'ovg'ona adams.
->>>>>>> 08ba6498054daf7aae8c20421322099c3abb7182
+Masqan Ğ'mertma adami çrma zilit daazina.Raxanats magar zilşi  ig'o gamayg'a  magigni er neqni magit gaaçina dedaqaci da s'ovg'ona adams.
\ No newline at end of file
diff --git a/01/reference.txt b/01/reference.txt
index 7bf3457e..b07cd899 100644
--- a/01/reference.txt
+++ b/01/reference.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Bibliuri ist'oria dabadebis s'igni 1-2 tavi
-=======
-Bibliur istoria Daadebis s'gnit 1-2 tavebit
->>>>>>> 08ba6498054daf7aae8c20421322099c3abb7182
+Bibliuri ist'oria dabadebis s'igni 1-2 tavi
\ No newline at end of file
diff --git a/02/reference.txt b/02/reference.txt
index e6ab8e0e..1dbea008 100644
--- a/02/reference.txt
+++ b/02/reference.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Bibliuri ist'oria dabadebis s'igni 3 tavi
-=======
-Bibliuri istoria Dabadebis s'ignit 3 tavi
->>>>>>> 08ba6498054daf7aae8c20421322099c3abb7182
+Bibliuri ist'oria dabadebis s'igni 3 tavi
\ No newline at end of file
diff --git a/17/08.txt b/17/08.txt
index 4e7342f7..024c2e34 100644
--- a/17/08.txt
+++ b/17/08.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Raxanats  Dautam maysmina Natani sit'q'va, magam madloba utxra da ganadida Ğmerti aymibey, rom Man Davutas eyge did hörmati daado da mihtsa maga eyge bevr dalotsiloba. Davutam ar itsoda, Ğmerti raxan  şaasrulevs am şep'irebuls. Magram çon vitsivart, rom israylianev mous'ivaq'e didxan lednuva mesiyai mosulamdin-titkmis 1000 tseli.
-=======
-Natanis natkom juğabevsuqan, Davitma madloba godovxada Ğmerts da ganadida higimibey, rom Ğmertma mihts eyge didebul p'at'ivi, da mihts maga did dalotsiloba. Magram Daviti ar itsoda raxan şaasrulevda, Ğmerti ey dap'irebulev. Magram, çon vitsit, rom israelis xalğs didxans mous'iva daledna Mesiay mosula, tkma ikneba 1000 s'eli.
->>>>>>> f341861ab0bf39a49fb70777debb72d63dd9b7a2
+Raxanats  Dautam maysmina Natani sit'q'va, magam madloba utxra da ganadida Ğmerti aymibey, rom Man Davutas eyge did hörmati daado da mihtsa maga eyge bevr dalotsiloba. Davutam ar itsoda, Ğmerti raxan  şaasrulevs am şep'irebuls. Magram çon vitsivart, rom israylianev mous'ivaq'e didxan lednuva mesiyai mosulamdin-titkmis 1000 tseli.
\ No newline at end of file