diff --git a/01/07.txt b/01/07.txt
index b17c13f..d3bc797 100644
--- a/01/07.txt
+++ b/01/07.txt
@@ -1,7 +1 @@
-<<<<<<< HEAD
-\v 7 Na panewi Yohanes dangngu linna:  "Ti sambalinggu yauwana, 'o pu ni ni sa'Tu  marisi pa kalada walli ti  yauwana, yauwa atta panyiamanni bakku karoduka dangngu pasili Ni leku salapa wissi -Na." \v 8 Yauwa kuparissa wainggummi  we,  takka Yinna ni ma mai sambalinggu yauwana, parissa wainggumi Ngasu Matua. Yohanes Na Parissai Muri Yesus
-=======
-\v 7 Na panewi Yohanes dangngu linna:  "Ti sambalinggu yauwana, 'o pu ni ni sa'Tu  marisi pa kalada walli ti  yauwana, yauwa atta panyiamanni bakku karoduka dangngu pasili Ni leku salapa wissi -Na." \v 8 Yauwa kuparissa wainggummi  we,  takka Yinna ni ma mai sambalinggu yauwana, parissa wainggumi Ngasu Matua.
-					
-Yohanes Na Parissai Muri Yesus
->>>>>>> b74ccb3b489a4d9382adeffa8ebfe5e262afb3e2
+\v 7 Na panewi Yohanes dangngu linna:  "Ti sambalinggu yauwana, 'o pu ni ni sa'Tu  marisi pa kalada walli ti  yauwana, yauwa atta panyiamanni bakku karoduka dangngu pasili Ni leku salapa wissi -Na." \v 8 Yauwa kuparissa wainggummi  we,  takka Yinna ni ma mai sambalinggu yauwana, parissa wainggumi Ngasu Matua. Yohanes Na Parissai Muri Yesus
\ No newline at end of file
diff --git a/03/28.txt b/03/28.txt
index 041b2fd..d8788a0 100644
--- a/03/28.txt
+++ b/03/28.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 28 Ku pekangguni mapullu pia, ngarandukka da tu ti pannu tana piani podasai ni djala dangngu ngarandukkani ni pullungga ni panewi nda. \v 29 Takka, herai ni ma pullu wainggi ni Ngasu Matua atta pia patanji ammanikka ba podasanni ni djala ma, makka djala ma atta mbosa sa." \v 30 Mabba mabokul Taurat ndo lidda-Ni, "Yinna surrukanni kamballiku ma irraka." Oli Dadi-Nai Yesus Ma Pullupia
-=======
-\v 28 Ku pekangguni mapullu pia, ngarandukka da tu ti pannu tana piani podasai ni djala dangngu ngarandukkani ni pullungga ni panewi nda. \v 29 Takka, herai ni ma pullu wainggi ni Ngasu Matua atta pia patanji ammanikka ba podasanni ni djala ma, makka djala ma atta mbosa sa." \v 30 Mabba mabokul Taurat ndo lidda-Ni, "Yinna surrukanni kamballiku ma irraka."
-Oli Dadi-Nai Yesus Ma Pullupia
->>>>>>> b74ccb3b489a4d9382adeffa8ebfe5e262afb3e2
+\v 28 Ku pekangguni mapullu pia, ngarandukka da tu ti pannu tana piani podasai ni djala dangngu ngarandukkani ni pullungga ni panewi nda. \v 29 Takka, herai ni ma pullu wainggi ni Ngasu Matua atta pia patanji ammanikka ba podasanni ni djala ma, makka djala ma atta mbosa sa." \v 30 Mabba mabokul Taurat ndo lidda-Ni, "Yinna surrukanni kamballiku ma irraka." Oli Dadi-Nai Yesus Ma Pullupia
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index bacb63f..0eb5cdd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -85,6 +85,7 @@
 		"03-20",
 		"03-23",
 		"03-26",
+		"03-28",
 		"03-31",
 		"03-33",
 		"04-title",