diff --git a/10-2SA.usfm b/10-2SA.usfm
index fd10b1a1..7dfeb783 100644
--- a/10-2SA.usfm
+++ b/10-2SA.usfm
@@ -111,20 +111,12 @@
 \s5
 \p
 \v 8 However, Ner's son Abner, the commander of Saul's army, took Saul's son Ish-Bosheth and went across the Jordan River to the city of Mahanaim.
-<<<<<<< Updated upstream
 \v 9 There Abner proclaimed that Ish-Bosheth was now the king, ruling the regions of Gilead and Jezreel and the tribes of Asher, Ephraim, and Benjamin. That meant that he was the king of most of Israel.
-=======
-\v 9 There Abner proclaimed that Ish-Bosheth was now the king ruling the regions of Gilead and Jezreel, and the tribes of Asher, Ephraim, and Benjamin. That meant that he was the king of most of Israel.
->>>>>>> Stashed changes
 
 \s5
 \p
 \v 10 Ish-Bosheth was forty years old when he started to rule over the Israelite people. He ruled them for two years. But the tribe of Judah was loyal to David.
-<<<<<<< Updated upstream
 \v 11 David ruled the tribe of Judah for seven and a half years while he was living in Hebron.
-=======
-\v 11 David ruled them for seven and a half years while he was living in Hebron.
->>>>>>> Stashed changes
 
 \s5
 \p
@@ -135,11 +127,7 @@
 \p
 \v 14 Abner said to Joab, "Let us tell some of our young men to fight each other!" Joab replied, "Very well!"
 \p
-<<<<<<< Updated upstream
 \v 15 So twelve men from the tribe of Benjamin fought for Ish-Bosheth against twelve of David's soldiers.
-=======
-\v 15 So twelve men from the tribe of Benjamin fought for Ish-Bosheth, against twelve of David's soldiers.
->>>>>>> Stashed changes
 
 \s5
 \v 16 Each of them grabbed the head of the man against whom he was fighting and thrust his sword into that man's side. The result was that all twenty-four of them fell down dead. So that area in Gibeon is now called "Field of Swords."
@@ -227,11 +215,7 @@
 \v 14 Then David sent messengers to Ish-Bosheth to say to him, "I killed one hundred men from Philistia and cut off their foreskins to give to Saul to pay for Michal to be my wife. So now give her back to me!"
 \p
 \v 15 So Ish-Bosheth sent some men to take Michal from her husband Paltiel. But when they took her, her husband followed them all the way to the city of Bahurim, crying as he went.
-<<<<<<< Updated upstream
 \v 16 Then Abner turned and said to him, "Go back home!" So he did.
-=======
-\v 16 Then Abner turned and said to him, "Go back home!" so he did.
->>>>>>> Stashed changes
 
 \s5
 \p
@@ -319,11 +303,7 @@
 \s5
 \v 11 So because you two evil men have murdered a man who did nothing wrong—and you killed him when he was sleeping on his bed in his own house, I will do something worse to you. I will surely get revenge on you two for murdering him and wipe you off from the earth!"
 \p
-<<<<<<< Updated upstream
 \v 12 Then David gave a command to his soldiers, and they killed the two men and cut off their hands and their feet and hung their bodies on a pole near the pool at Hebron. But they took the head of Ish-Bosheth and buried it respectfully in the tomb of Abner, there at Hebron.
-=======
-\v 12 Then David gave a command to his soldiers, and they killed the two men, and cut off their hands and their feet, and hung their bodies on a pole near the pool at Hebron. But they took the head of Ish-Bosheth and buried it respectfully in the tomb of Abner, there at Hebron.
->>>>>>> Stashed changes
 
 \s5
 \c 5