diff --git a/02/01.txt b/02/01.txt
index 07b9900..cf70792 100644
--- a/02/01.txt
+++ b/02/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 2 \v 1 Pa+ ya,umieme, ek+ pakua'y+we yuk+ pemutayini, ek+ tewi, ek+ jipame wajetsie petiu'j+pa pewarant'x+r+wat+, hipame watsie tita aix+ kwati ane, ek+ a hep+sta, ek+t+t+ pepan,ataj+pa. ek+ ke'hate pewaranta'x+r+wa, ek+ta hapa+na p+petikamiet+. \v 2 Ya'umieme tame tete'akumate Kakak+yari aix+ rakayurieni heitsiemek+ kastiku wayatuirieni iya te+teri ke'hate aix+'mekatekaju.
-=======
-\c 2 \v 1 \v 2 'Ekɨ 'uki, aixɨ perakayuruwa hipame watsie, a hetsie miemekɨ pe yɨane
->>>>>>> c902d4346bbd7094374d5c8c650e2828830f99cb
+\c 2 \v 1 Pa+ ya,umieme, ek+ pakua'y+we yuk+ pemutayini, ek+ tewi, ek+ jipame wajetsie petiu'j+pa pewarant'x+r+wat+, hipame watsie tita aix+ kwati ane, ek+ a hep+sta, ek+t+t+ pepan,ataj+pa. ek+ ke'hate pewaranta'x+r+wa, ek+ta hapa+na p+petikamiet+. \v 2 Ya'umieme tame tete'akumate Kakak+yari aix+ rakayurieni heitsiemek+ kastiku wayatuirieni iya te+teri ke'hate aix+'mekatekaju.
\ No newline at end of file