Fix Ben-Hadad

11-1KI.usfm

@@ -1307,13 +1307,8 @@
 
 \s5
 \p
-<<<<<<< HEAD
-\v 18 So Asa told his workers to take all the silver and gold that was still in the storerooms in the temple and in the palace and give it to some of his officials. He told them to take it to Damascus and give it to King Ben-Hadad who ruled Aram. Ben-Hadad was son of Tabrimmon and grandson of Hezion. He told the officials to say this to Ben-Hadad:
-\v 19 "I want there to be a peace treaty between me and you as there was between my father and your father. For that purpose, I am giving you this silver and gold. So now please cancel the treaty that you made with Baasha king of Israel so that he will take his soldiers away from attacking mine because he will be afraid of your army."
-=======
 \v 18 So Asa told his workers to take all the silver and gold that was still in the storerooms in the temple and in the palace and gave it to some of his officials. He told them to take it to Damascus and give it to King Ben-Hadad who ruled Aram. Ben-Hadad was son of Tabrimmon and grandson of Hezion. He told the officials to say this to Ben-Hadad:
 \v 19 "I want there to be a peace treaty between me and you, like there was between my father and your father. For that purpose, I am giving you this silver and gold. So now please cancel the treaty that you made with Baasha, the king of Israel, in order that he will take his soldiers away from attacking mine, because he will be afraid of your army."
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \v 20 So the officials went and gave the message to Ben-Hadad, and he did what Asa suggested. He sent his army commanders and their soldiers to attack some of the towns in Israel. They captured Ijon, Dan, Abel of Beth Maakah, the area near the Sea of Galilee, and all the land of the tribe of Naphtali.
@@ -1655,27 +1650,16 @@
 \s5
 \c 20
 \p
-<<<<<<< HEAD
-\v 1 Ben-Hadad, the king of Aram, gathered all of his army, and he brought thirty-two lesser kings to join him with their armies and horses and chariots. They marched to the city of Samaria, the capital of Israel, and surrounded it and prepared to attack it.
-\v 2 Ben-Hadad sent messengers into the city to King Ahab, and they said this to him: "This is what King Ben-Hadad says:
-\v 3 'You must give to me all of your silver and gold, your good-looking wives, and your strongest children.'"
-=======
 \v 1 Ben-Hadad, the king of Aram, gathered all his army, and he brought thirty-two lesser kings to join him with their armies and horses and chariots. They marched to the city of Samaria, the capital of Israel, and surrounded it and prepared to attack it.
 \v 2 Ben-Hadad sent messengers into the city to King Ahab, and they said this to him: "This is what King Ben-Hadad says:
 \v 3 'You must give to me all your silver and gold, your good-looking wives and strongest children.'"
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p
 \v 4 The king of Israel replied to them, "Tell this to King Ben-Hadad, 'I agree to do what you requested. You can have me and everything that I own.'"
 \p
-<<<<<<< HEAD
-\v 5 The messengers told that to Ben-Hadad, and he sent them back with another message: "I sent a message to you saying that you must give me all of your silver and gold and your wives and your children.
-\v 6 But in addition to that, about this time tomorrow, I will send some of my officials to search your palace and the houses of your officials and to bring to me everything that they see is valuable."
-=======
 \v 5 The messengers told that to Ben-Hadad, and he sent them back with another message: "I sent a message to you saying that you must give me all your silver and gold and your wives and your children.
 \v 6 But in addition to that, about this time tomorrow, I will send some of my officials to search your palace and the houses of your officials, and to bring to me everything that they see is valuable."
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p
@@ -1705,11 +1689,7 @@
 
 \s5
 \v 16 They started to attack at noon, while Ben-Hadad and the other rulers were getting drunk in their temporary shelters.
-<<<<<<< HEAD
-\v 17 The young soldiers advanced first. Some scouts who had been sent out by Ben-Hadad reported to him, "There are men coming out of Samaria!"
-=======
 \v 17 The young soldiers advanced first. Some scouts who had been sent out by Ben-Hadad reported to him, "There are men coming out of Samaria"!
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p
@@ -1718,13 +1698,8 @@
 \v 19 The young Israelite soldiers went out of the city to attack the Aramean army, and the other soldiers in the Israelite army followed them.
 
 \s5
-<<<<<<< HEAD
-\v 20 Each Israelite soldier killed an Aramean soldier. The rest of the Aramean army then ran away, and the Israelite soldiers pursued them. But King-Ben Hadad escaped riding his horse, along with some other men riding horses.
-\v 21 Then the king of Israel went out of the city; he and his soldiers captured all the other Aramean horses and chariots and also killed a large number of Aramean soldiers.
-=======
 \v 20 Each Israelite soldier killed an Aramean soldier. The rest of the Aramean army then ran away, and the Israelite soldiers pursued them. But King Ben-Hadad escaped riding his horse, along with some other men riding horses.
 \v 21 Then the king of Israel went out of the city; he and his soldiers captured all the other Aramean horses and chariots, and also killed a large number of Aramean soldiers.
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p
@@ -1760,11 +1735,7 @@
 \p
 \v 33 Ben-Hadad's officials were trying to find out if Ahab would act mercifully, and when Ahab said "brother," they were optimistic. So they replied, "Yes, he is like your brother!" Ahab said, "Go and bring him to me." So they went and brought Ben-Hadad to him. When Ben-Hadad arrived, Ahab told him to get in the chariot and sit with him.
 \p
-<<<<<<< HEAD
-\v 34 Ben-Hadad said to him, "I will give back to you the towns that my father's army took from your father. And I will allow you to set up market areas for your merchants in Damascus my capital, just as my father did in Samaria your capital." Ahab replied, "Because you agree to do that, I will not execute you." So Ahab made an agreement with Ben-Hadad and allowed him to go home.
-=======
 \v 34 Ben-Hadad said to him, "I will give back to you the towns that my father's army took from your father. And I will allow you to set up market areas for your merchants in Damascus my capital, just as my father did in Samaria your capital." Ahab replied, "Because you agree to do that, I will not execute you." So Ahab made an agreement with Ben-Hadad, and allowed him to go home.
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p

12-2KI.usfm

@@ -568,11 +568,7 @@
 \p
 \v 14 Then Hazael left and returned to his master the king, who asked him, "What did Elisha say?"
 \p He replied, "He told me that you would certainly recover."
-<<<<<<< HEAD
-\v 15 But the next day, while the king was sleeping, Hazael took a blanket and soaked it in water. Then he spread it on the king's face so that he could not breathe, and he died. Then Hazael became the king of Aram instead of Ben-Hadad.
-=======
 \v 15 But the next day, while the king was sleeping, Hazael took a blanket and soaked it in water. Then he spread it on the king's face in order that he could not breathe, and he died. Then Hazael became the king of Aram instead of Ben-Hadad.
->>>>>>> Ben Hadad changed to Ben-Hadad to regularized UDB with ULB
 
 \s5
 \p