Conflicts

Reconciled

11-1KI/02.usfm

@@ -53,7 +53,7 @@
 \s5
 \p
 \v 26 Then to Abiathar the priest the king said, "Go to Anathoth, to your own fields. You are worthy of death, but I will not at this time put you to death, because you carried the ark of the Lord Yahweh before David my father and suffered in every way my father suffered."
-\f + \ft Some versions have, \fqa ...the ark of Yahweh.... \fqb \f*
+\f + \ft Some versions have, \fqa ... the ark of Yahweh ... \fqb \f*
 \v 27 So Solomon dismissed Abiathar from being priest to Yahweh, that he might fulfill the word of Yahweh, which he had spoken concerning the house of Eli at Shiloh.
 
 \s5

19-PSA/073.usfm

@@ -32,19 +32,19 @@
  
 \s5
 \q
-\v 8 They mockingly say evil things;
-\q they proudly threaten violence.
+\v 8 They mock and speak wickedly;
+\q they speak loftily of oppression. 
 \q
-\v 9 They speak against the heavens,
+\v 9 They set their mouth against the heavens,
 \q and their tongues roam through the earth.
  
 \s5
 \q
-\v 10 Therefore God's people turn to them
-\q and drink deeply at their words.
+\v 10 Therefore his people return to here
+\q and waters of fullness are drained by them.
 \q
 \v 11 They say, "How does God know?
-\q Does God know what goes on?"
+\q Is there knowledge with the Most High?"
 \q
 \v 12 Take notice: these people are wicked;
 \q they are always carefree, becoming richer and richer.
@@ -54,7 +54,7 @@
 \v 13 Surely it is in vain that I have guarded my heart
 \q and washed my hands in innocence.
 \q
-\v 14 For all the day long have I been afflicted
+\v 14 For all the day long I have been afflicted
 \q and disciplined every morning.
 \q
 \v 15 If I had said, "I will say these things,"

19-PSA/074.usfm

@@ -8,8 +8,8 @@
 \v 1 God, why have you rejected us forever?
 \q Why does your anger burn against the sheep of your pasture?
 \q
-\v 2 Call to mind your people, whom you redeemed in ancient times,
-\q whom you have purchased to be your own heritage,
+\v 2 Call to mind your people, whom you purchased in ancient times,
+\q the tribe whom you have redeemed to be your own heritage,
 \q and Mount Zion, where you live.
  
 \s5
@@ -37,7 +37,7 @@ to the ground.
  
 \s5
 \q
-\v 9 We do not see any more miraculous signs from God;
+\v 9 We do not see any more signs;
 \q there is no prophet any more,
 \q and no one among us knows how long this will last.
 \q
@@ -85,8 +85,13 @@ to the ground.
 \v 20 Call to mind your covenant,
 \q for the dark regions of the earth are full of places of violence.
 \q
+<<<<<<< HEAD
 \v 21 Do not let the oppressed be turned back in shame;
 \q may the poor and oppressed praise your name. 
+=======
+\v 21 May the oppressed not turn back in shame;
+\q may the poor and needy praise your name. 
+>>>>>>> origin/master
  
 \s5
 \q

19-PSA/084.usfm

@@ -25,10 +25,11 @@
 \s5
 \q
 \v 5 Blessed is the man whose strength is in you,
-\q in whose heart are the highways to Zion.
+\q in whose heart are the highways up to Zion.
 \q
-\v 6 Passing through the valley of Weeping, they find springs of water to drink.
-\q The early rains cover it with pools of water.
+\v 6 Passing through the Valley of Tears, they find springs of water to drink.
+\q The early rains cover it with blessings.
+\f + \ft Some versions have \fqa with pools of water \fqb . \f*
  
 \s5
 \q

20-PRO/08.usfm

@@ -56,7 +56,7 @@
 \s5
 \q
 \v 14 I have good advice and sound wisdom;
-\q I have insight, and strength belongs to me.
+\q I am insight; strength belongs to me.
 \q
 \v 15 By me kings reign—
 \q also noblemen, and all who govern justly.

20-PRO/10.usfm

@@ -40,10 +40,11 @@
 \s5
 \q
 \v 10 He who winks the eye causes grief,
-\q but a talkative fool will be ruined.
+\q but a talkative fool will be thrown down.
+\f + \ft Some modern versions have \fqa but one who bravely corrects makes peace \fqb . \f*
 \q
-\v 11 The mouth of one who does right is a fountain of life,
-\q but the mouth of the wicked hides violence.
+\v 11 The mouth of one who does right is a water spring of life,
+\q but the mouth of the wicked covers up violence.
 
 \s5
 \q

20-PRO/21.usfm

@@ -115,8 +115,9 @@
 
 \s5
 \q
-\v 29 A wicked man makes himself seem strong, 
-\q but an upright person is careful about his actions.
+\v 29 A wicked man makes his face hard, 
+\q but an upright person is certain about his ways.
+\f + \ft Some modern versions have \fqa but an upright person thinks about his way \fqb . \f*
 
 \s5
 \q

20-PRO/25.usfm

@@ -113,7 +113,8 @@
 \s5
 \q
 \v 27 It is not good to eat too much honey;
-\q that is like searching for honor upon honor.
+\q that is like searching for honor after honor.
+\f + \ft Modern versions have different interpretations of this difficult verse. \f*
 \q
 \v 28 A person without self-control 
 \q is like a city breached and without walls.

21-ECC/08.usfm

@@ -36,6 +36,7 @@ There is a time when a person has power to do evil to others.
 
 \s5
 \v 10 So I saw the wicked buried publicly. They were taken from the holy area and buried and were praised by people in the city where they had done their wicked deeds. This also is uselessness.
+\f + \ft Some modern versions have other interpretations of this difficult verse: \fqa I saw wicked people come and go into the holy place. They proudly spoke in the city about the things they had done. This also is uselessness. \fqb Other versions have \fqa I saw wicked people come and go into the holy place. They were praised in the city for the things they had done. This also is uselessness. \fqb \f*
 \v 11 When a sentence against an evil crime is not executed quickly, it entices the hearts of human beings to do evil.
 
 \s5