Fix

04-NUM.usfm

@@ -2562,13 +2562,8 @@
 \s5
 \v 6 When Moses sent them to the battle, Phinehas son of Eleazar the priest went with them. He took with him some of the things from the sacred tent and the trumpets that would be blown to give the signal to start the battle.
 \p
-<<<<<<< HEAD
-\v 7 The Israelite men fought the soldiers from the Midian people, as Yahweh had told Moses to tell them to do, and they killed every man from the Midian people.
-\v 8 Among those whom they killed were the five kings of the Midian people—Evi, Rekem, Zur, Hur, and Reba. They also killed Balaam son of Beor with a sword.
-=======
 \v 7 The Israelite men fought the soldiers who were from the Midian people, as Yahweh had told Moses to tell them to do, and they killed every man from the Midian people.
 \v 8 Among those whom they killed were the five kings of the Midian people—Evi, Rekem, Zur, Hur, and Reba. They also killed Balaam with a sword son of Beor.
->>>>>>> people. lc word changed for
 
 \s5
 \v 9 They captured all the women and children of the Midian people and took away their cattle, flocks of sheep, herds of goats, and all their other possessions.
@@ -2721,11 +2716,7 @@
 
 \s5
 \p
-<<<<<<< HEAD
-\v 33 So Moses agreed to give that land to the tribes of Gad and Reuben and to half of the tribe of Joseph's son Manasseh. That land was previously the land where Sihon the king of the Amor people and Og the king of Bashan region ruled, including its cities and surrounding land.
-=======
 \v 33 So Moses agreed to give that land to the tribes of Gad and Reuben and to half of the tribe of Joseph's son Manasseh. That land was previously the land where Sihon, the king of the Amor people, ruled, and the land where Og, the king of Bashan, ruled, including its cities and surrounding land.
->>>>>>> people. lc word changed for
 
 \s5
 \p

05-DEU.usfm

@@ -15,11 +15,7 @@
 \s5
 \p
 \v 3 Forty years after the Israelites had left Egypt, Moses told the Israelite people everything that Yahweh had commanded him.
-<<<<<<< HEAD
-\v 4 This was after they had defeated Sihon, the king of the Amor people, who lived in the city of Heshbon; and Og, the king of the region of Bashan, who lived in towns of Ashtaroth and Edrei.
-=======
 \v 4 This was after they had defeated Sihon, the king of the Amor people, who lived in the city of Heshbon, and Og, the king of the region of Bashan, who lived in towns of Ashtaroth and Edrei.
->>>>>>> people. lc word changed for
 
 \s5
 \p
@@ -166,24 +162,15 @@
 \p
 \v 20 (That region is also called the land of the Repha giants, who formerly lived there. The Ammon people call them the Zamzum group.
 \v 21 They were a large and powerful group, who were as tall as the descendants of Anak. But Yahweh destroyed them, and the Ammon people drove them away and took their land from them and started to live there.
-<<<<<<< HEAD
-\v 22 Yahweh had done the same thing for the descendants of Esau who live in the hill country of Edom. He got rid of the Hor people, with the result that the Edom people took their land from them and started to live there. They still live there.
-=======
 \v 22 Yahweh had done the same thing for the descendants of Esau who live in the hill country of Edom. He got rid of the people of Hor, with the result that the people of Edom took their land from them and started to live there. They still live there.
->>>>>>> people. lc word changed for
 
 \s5
 \v 23 People who came from the island of Crete got rid of the Av group who previously lived in the land close to the Mediterranean Sea, as far south as Gaza. They took their land from them and started to live there.)
 
 \s5
 \p
-<<<<<<< HEAD
-\v 24 "After we had gone through the region of Moab, Yahweh said to us, 'Now cross the Arnon River. I will help you to defeat the army of Sihon, the king of the Amor people. who lives in the city of Heshbon. So attack their army and start to take their land from them.
-\v 25 Today I will begin to cause everyone everywhere to be afraid of you. Everyone who hears about you will tremble and be terrified.'
-=======
 \v 24 "After we had gone through the region of Moab, Yahweh said to us, 'Now cross the Arnon River. I will help you to defeat the army of Sihon, the king of the Amor people, who lives in the city of Heshbon. So attack their army and start to take their land from them.
 \v 25 Today I will begin to cause everyone, everywhere, to be afraid of you. Everyone who hears about you will tremble and be terrified.'
->>>>>>> people. lc word changed for
 
 \s5
 \p
@@ -215,13 +202,8 @@
 \s5
 \c 3
 \p
-<<<<<<< HEAD
-\v 1 "Then we turned north and went toward the region of Bashan. Og the king of that area and all his soldiers marched south to fight against us at the city of Edrei.
-\v 2 Yahweh said to me, 'Do not be afraid of him, because I will enable your army to defeat him and all his army and to capture all their land. Do to him what you did to Sihon the king of the Amor people who ruled in Heshbon.'
-=======
 \v 1 "Then we turned north and went toward the region of Bashan. Og, the king of that area, and all his soldiers marched south to fight against us at the city of Edrei.
 \v 2 Yahweh said to me, 'Do not be afraid of him, because I will enable your army to defeat him and all his army and to capture all their land. Do to him what you did to Sihon, the king of the Amor people, who ruled in Heshbon.'
->>>>>>> people. lc word changed for
 
 \s5
 \p
@@ -497,7 +479,7 @@
 
 \s5
 \v 6 Never forget these commands that I am giving to you today.
-\v 7 Teach them to your children again and again. Talk about them all the time. When you are in your houses and when you are walking outside, talk about them also when you are lying down and when you wake up.
+\v 7 Talk about them to your children all the time. Talk about them when you are sitting in your houses and when you are walking beside the road, and when you are lying down and when you wake up.
 
 \s5
 \v 8 Write them on tiny scrolls and fasten them to your arms, and write them on bands that you fasten to your foreheads to help you to remember them.
@@ -584,8 +566,8 @@
 \v 22 He will gradually drive out those peoples. You should not try to drive all of them out at one time, because if you did that, the number of wild animals would quickly increase, and you would not be able to get rid of them.
 
 \s5
-\v 23 Instead, Yahweh will enable you to defeat your enemies one people at a time. He will cause them to panic until they are destroyed.
-\v 24 He will enable you to defeat their kings. After you kill them, their names will be forgotten. No people will be able to stop you; you will destroy all of them.
+\v 23 Yahweh your God will help you to defeat your enemies. He will cause them to panic so much that they will be destroyed.
+\v 24 He will help you to defeat their kings. After you kill them, their names will be forgotten. No people will be able to stop you; you will destroy all of them.
 
 \s5
 \v 25 You must burn the carved figures that represent their gods. Do not desire to take the silver or gold decorations that are on those idols, because if you take them for yourselves, they will be like a trap to catch you. Yahweh hates every part of those idols.