diff --git a/12/01.txt b/12/01.txt
index fe7dc97..dd791a9 100644
--- a/12/01.txt
+++ b/12/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 1 Nyatembelari ne dze aya , ba dedu dji gu Djigi , agemu kuirī kéu gu enzū asti ayi kaliaka du bie , satu , ngba te ku Djigi , gu atefuiri nenga makia atsi . \v 2 Akia yi du ūguamenme du fiyi , angoro atsi ayidu ūame abebieli , badzeaya ayirara ango gū nye Djigi mete , gu ne bangamba , ngbangba .
-=======
-\v 1Akpalime ano ne sheri,bangr gu a Djigi ayika guru mapkume ne shara,fuyi kueri kubude,ne bengamba djigu du gule,ne bengamba,aya Djigi,djigu benga wu nya zoko akadji ne benga ndala ayako.Mbe gu tembelame eyi.\v 2Akia yiayi ligrame te bieli adje naleleme,bame fu ayiyi Djigi akubiri giri egu bango angrome kpungbuluko.
->>>>>>> 63839df8249693709cc769a4d145b18126e283a1
+\c 12 \v 1 Akpalime ano ne sheri,bangr gu a Djigi ayika guru mapkume ne shara,fuyi kueri kubude,ne bengamba djigu du gule,ne bengamba,aya Djigi,djigu benga wu nya zoko akadji ne benga ndala ayako.Mbe gu tembelame eyi. \v 2 Akia yiayi ligrame te bieli adje naleleme,bame fu ayiyi Djigi akubiri giri egu bango angrome kpungbuluko.
\ No newline at end of file
diff --git a/12/title.txt b/12/title.txt
index c415dde..a185ae9 100644
--- a/12/title.txt
+++ b/12/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Likpi 12
-=======
-Lkpi12
->>>>>>> 63839df8249693709cc769a4d145b18126e283a1
+Likpi 12
\ No newline at end of file
diff --git a/front/title.txt b/front/title.txt
index e3670f4..48c2ff6 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,9 +1 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-Buku a Roma
-=======
-Baroma
->>>>>>> b3911cadb65cbda6d5f6be551a9b1b4d49490d03
-=======
-Baroma
->>>>>>> 81915e25e57b0203c9b6e65a4d69c171b82bf706
+Baroma
\ No newline at end of file