Files fixed

10-2SA.usfm

@@ -383,12 +383,12 @@
 \v 9 Then David was afraid of what else Yahweh would do to punish them, so he said, "How can I take the sacred chest with me to Jerusalem?"
 
 \s5
-\v 10 So he decided not to take the sacred chest to Jerusalem. Instead, they took it to another place, the house of Obed Edom the Gittite.
+\v 10 So he decided not to take the sacred chest to Jerusalem. Instead, they took it to another place, the house of Obed-Edom the Gittite.
-\v 11 They left the sacred chest in the house of Obed Edom for three months, and during that time Yahweh blessed him and his family.
+\v 11 They left the sacred chest in the house of Obed-Edom for three months, and during that time Yahweh blessed him and his family.
 
 \s5
 \p
-\v 12 Some time later, people told David, "Yahweh has blessed Obed Edom and his family because he is taking care of the sacred chest!" When David heard that, he and some other men went to Obed Edom's house and very joyfully brought the sacred chest from there to Jerusalem.
+\v 12 Some time later, people told David, "Yahweh has blessed Obed-Edom and his family because he is taking care of the sacred chest!" When David heard that, he and some other men went to Obed-Edom's house and very joyfully brought the sacred chest from there to Jerusalem.
 \v 13 When the men who were carrying the sacred chest had walked six steps, they stopped, and there David killed a bull and a fat calf and offered them to Yahweh as a sacrifice.
 
 \s5

13-1CH.usfm

@@ -1513,7 +1513,11 @@ Iphdeiah, and Penuel.
 
 \s5
 \p
+<<<<<<< Updated upstream
 \v 12 That day, David was afraid of God. He asked himself, "How can I bring God's sacred chest to my city?"
+=======
+\v 12 That day, David was afraid of God. He asked himself, "How can I bring God's sacred chest to my city?
+>>>>>>> Stashed changes
 \v 13 So the men with David did not take the sacred chest to Jerusalem. Instead, they took it to the house of Obed-Edom, who was from the city of Gath.
 \v 14 The sacred chest stayed with Obed-Edom's family in his house for three months. During that time Yahweh blessed Obed-Edom's family and everything that he owned.
 
@@ -1594,14 +1598,22 @@ Iphdeiah, and Penuel.
 \p
 \v 16 David told the leaders of the descendants of Levi to appoint some of their relatives to sing and play lyres, harps, and cymbals and to sing joyful songs while they were carrying the sacred chest.
 \p
+<<<<<<< Updated upstream
 \v 17 So they appointed Heman and his relatives Asaph and Ethan. Heman was the son of Joel; Asaph was the son of Berekiah. Ethan son of Kushaiah was a descendant of Merari.
+=======
+\v 17 So they appointed Heman and his relatives Asaph and Ethan. Heman son of Joel; Asaph son of Berekiah. Ethan son of Kushaiah, was a descendant of Merari.
+>>>>>>> Stashed changes
 \v 18 There was also another group of descendants of Levi who were appointed: Zechariah, Jaaziel, Shemiramoth, Jehiel, Unni, Eliab, Benaiah, Maaseiah, Mattithiah, Eliphelehu, Mikneiah, and two of the temple gatekeepers, Obed-Edom and Jeiel.
 
 \s5
 \p
 \v 19 Heman, Asaph and Ethan sang, but also played bronze cymbals.
 \v 20 Zechariah, Aziel, Shemiramoth, Jehiel, Unni, Eliab, Maaseiah, and Benaiah played lyres.
+<<<<<<< Updated upstream
 \v 21 Mattithiah, Eliphelehu, Mikneiah, Obed-Edom, Jeiel, and Azaziah played harps.
+=======
+\v 21 Mattithiah, Eliphelehu, Mikneiah, Obed-Edom, Jeiel and Azaziah played harps.
+>>>>>>> Stashed changes
 
 \s5
 \v 22 Kenaniah, the leader of the descendants of Levi, directed the singing because he was very capable of doing that.
@@ -1612,7 +1624,11 @@ Iphdeiah, and Penuel.
 \s5
 \p
 \v 25 David and the Israelite leaders and the officers who commanded one thousand soldiers went to get the sacred chest. They went to bring it from Obed-Edom's house. They went very joyfully.
+<<<<<<< Updated upstream
 \v 26 God helped the descendants of Levi who carried the sacred chest of Yahweh; therefore, David and the leaders sacrificed seven bulls and seven rams to thank him.
+=======
+\v 26 God helped the descendants of Levi who carried the sacred chest of Yahweh; therefore David and the leaders sacrificed seven bulls and seven rams to thank him.
+>>>>>>> Stashed changes
 
 \s5
 \v 27 The descendants of Levi who carried the sacred chest, the singers, and Kenaniah, the man who directed those who sang, all wore robes of fine white linen and sacred vests made of fine linen. David also wore a waistcloth made of white linen.
@@ -1754,7 +1770,7 @@ Iphdeiah, and Penuel.
 
 \s5
 \v 37 Then David left Asaph and the other members of his clan there in front of the tent in which Yahweh's sacred chest had been placed. He told them that they must do their work there every day.
-\v 38 David also left Obed Edom and 68 other descendants of Levi to work with them. Hosah and Obed Edom guarded the entrances of the sacred tent.
+\v 38 David also left Obed-Edom and 68 other descendants of Levi to work with them. Hosah and Obed-Edom guarded the entrances of the sacred tent.
 \p
 \v 39 David also told Zadok the high priest and the other priests who worked with him to remain in front of Yahweh's sacred tent, at the place where the Israelite people worshiped Yahweh there in the city of Gibeon.
 
@@ -2335,17 +2351,17 @@ Iphdeiah, and Penuel.
 
 \s5
 \q
-\v 4 Another guard was Obed Edom.
+\v 4 Another guard was Obed-Edom.
 \q2 His oldest son was Shemaiah. His other sons were Jehozabad, Joah, Sakar, Nethanel,
 \v 5 Ammiel, Issachar, and Peullethai. It was because God had blessed him that he had many sons.
 \q2
-\v 6 Obed Edom's son Shemaiah also had sons. They were leaders in their father's family because they were capable of doing many things well.
+\v 6 Obed-Edom's son Shemaiah also had sons. They were leaders in their father's family because they were capable of doing many things well.
 
 \s5
 \q2
 \v 7 The sons of Shemaiah were Othni, Rephael, Obed, and Elzabad. Shemaiah's relatives Elihu and Semakiah were also capable men.
 \q2
-\v 8 All of those descendants of Obed Edom and their sons and relatives were capable people and strong workers. Altogether there were 62 of them.
+\v 8 All of those descendants of Obed-Edom and their sons and relatives were capable people and strong workers. Altogether there were 62 of them.
 \q
 \v 9 Another guard was Meshelemiah. He and his sons and relatives were also capable people. There were 18 of them altogether.
 
@@ -2362,7 +2378,7 @@ Iphdeiah, and Penuel.
 
 \s5
 \q
-\v 15 Then Obed Edom's group was selected to guard the south gate, and his sons were selected to guard the entrances to the temple storerooms.
+\v 15 Then Obed-Edom's group was selected to guard the south gate, and his sons were selected to guard the entrances to the temple storerooms.
 \li
 \v 16 Then Shuppim's group and Hosah's group were selected to guard the west gate and the Shalleketh Gate on the upper road to the temple.
 \p The work for the guards was divided evenly.

14-2CH.usfm

@@ -1320,7 +1320,7 @@
 
 \s5
 \v 23 King Jehoash's army also captured King Amaziah there. Then he brought Amaziah to Jerusalem, and his soldiers tore down the wall that was around the city, from the Ephraim Gate to the Corner Gate. That was a section that was 180 meters long.
-\v 24 His soldiers also carried away the gold, silver, and other valuable objects from the temple that the descendants of Obed Edom had been guarding. They also took away the valuable things in the palace, and they took to Samaria some prisoners whom they had captured.
+\v 24 His soldiers also carried away the gold, silver, and other valuable objects from the temple that the descendants of Obed-Edom had been guarding. They also took away the valuable things in the palace, and they took to Samaria some prisoners whom they had captured.
 
 \s5
 \p