Consistency found by Bob Johnson

01-GEN.usfm

@@ -3250,7 +3250,7 @@ and in the evening they will divide among their warriors the spoils that they se
 \v 28 Those twelve sons are the ancestors of the twelve tribes of Israel. That is what their father said to them as he blessed them, telling to each one words that were right for him.
 \p
 \v 29 Then Jacob said to his sons, "I will soon die and join my ancestors who have already died. Bury my body where some of my ancestors are buried, in the cave that is in the field that was bought from Ephron, who belonged to the Heth people.
-\v 30 The field of Machpelah, was east of Mamre, in the land of Canaan. Abraham bought it from Ephron to use as a burial place.
+\v 30 The cave in the field of Machpelah was located east of Mamre in the land of Canaan. This cave was in the field that Abraham bought from Ephron to use as a burial place.
 
 \s5
 \v 31 That is where they buried him and his wife Sarah. That is where they buried my father Isaac and his wife Rebekah. And that is where I buried my wife Leah.

02-EXO.usfm

@@ -139,7 +139,7 @@ Now the man who was the priest for the Midian people, whose name was Jethro, had
 \v 13 Moses said to God, "If I go to the Israelite people and say to them, 'God, the one your ancestors worshiped, has sent me to you,' they will ask me, 'What is his name?' Then what should I say to them?"
 \v 14 God replied to Moses, "I AM WHO I AM. Tell the Israelite people that the one named 'I AM' has sent you to them."
 \p
-\v 15 God also said to Moses, "You must say to the Israelites, 'Yahweh, the God of your fathers, the God whom Abraham worshiped, whom Isaac worshiped, and whom Jacob worshiped, has sent me to you. Yahweh is my name forever, and this is what all generations should call me.'
+\v 15 God also said to Moses, "You must say to the Israelites, 'Yahweh, the God of your fathers, the God whom Abraham worshiped, whom Isaac worshiped, and whom Jacob worshiped, has sent me to you. Yahweh is my name forever, and this is how all generations should remember me.'
 
 \s5
 \v 16 Go to Egypt and gather together the elders. Say to them, 'Yahweh, the God whom Abraham worshiped, whom Isaac worshiped, and whom Jacob worshiped, has appeared to me and said: I have seen what the Egyptian people have done to you.
@@ -1688,12 +1688,17 @@ A thief must pay for what he stole. If he has no animal with which to pay for th
 \v 12 Then he should fasten the stones onto the shoulder straps of the sacred apron to represent the twelve tribes of Israel. In that way, Aaron will carry the names of the tribes on his shoulders in order that I, Yahweh, will never forget my people.
 
 \s5
+<<<<<<< HEAD
 \v 13 The settings for the stones must be made from gold.
 \v 14 Tell them to make two chains of gold that are braided like cords and to fasten the chains to the settings.
+=======
+\v 13 The settings for the stones must be made from gold,
+\v 14 and two chains of gold that are braided like cords and to fasten the chains to the settings."
+>>>>>>> Consistency found by Bob Johnson
 
 \s5
 \p
-\v 15 Tell the skilled workman to make a sacred pouch for Aaron to wear over his chest. He will use this to find out what I want the people to do. They must make it of the same materials as the sacred apron, and they must embroider it in the same way with gold, blue, purple, and red fine linen.
+\v 15 Tell the skilled workman to make a sacred pouch for Aaron to wear over his chest. He will use this to find out what I want the people to do. The skilled workman must make it of the same materials as the sacred apron, and he must embroider it in the same way with gold, blue, purple, and red fine linen.
 \v 16 It is to be square, and the material must be folded double so that it is twenty-three centimeters long and twenty-three centimeters wide.
 
 \s5
@@ -2186,6 +2191,7 @@ A thief must pay for what he stole. If he has no animal with which to pay for th
 \v 12 the sacred chest with its poles and its lid; and the curtain that will separate the holy place from the very holy place.
 
 \s5
+<<<<<<< HEAD
 \v 13 The workers also made the table with the poles for carrying it and all the things that will be used with the table, the bread to display before God,
 \v 14 the lampstand for the lamps with all the things that will be used to take care of them; the oil for the lamps,
 \v 15 the altar for burning incense and the poles for carrying the altar, the oil for anointing and the sweet-smelling incense, the curtain for the entrance of the sacred tent,
@@ -2194,6 +2200,16 @@ A thief must pay for what he stole. If he has no animal with which to pay for th
 \s5
 \v 17 They workers made the curtains to surround the courtyard and the posts and bases for the posts to support the curtains, the curtain for the entrance to the courtyard,
 \v 18 the pegs and ropes for the sacred tent,
+=======
+\v 13 The workers also should come and make the table with the poles for carrying it and all the things that will be used with the table; the bread to display before God;
+\v 14 the lampstand for the lamps with all the things that will be used to take care of them; the oil for the lamps;
+\v 15 the altar for burning incense and the poles for carrying the altar; the oil for anointing and the sweet-smelling incense; the curtain for the entrance of the sacred tent;
+\v 16 the altar for offering sacrifices that will be burned and its bronze grating; the poles for carrying the altar and all the things that will be used with it; the washbasin and its base.
+
+\s5
+\v 17 They workers should come and make the curtains to surround the courtyard and the posts and bases for the posts to support the curtains; the curtain for the entrance to the courtyard;
+\v 18 the pegs and ropes for the sacred tent;
+>>>>>>> Consistency found by Bob Johnson
 \v 19 and the beautiful clothes that Aaron and his sons are to wear when they do their work in the holy place."
 
 \s5