From 3607065ab50e18110d99f32cd4281f89f1c8f45b Mon Sep 17 00:00:00 2001
From: Tom Warren <tom_warren@wycliffeassociates.org>
Date: Wed, 7 Sep 2016 09:50:24 -0400
Subject: [PATCH] changes

---
 19-PSA/037.usfm | 8 ++++----
 19-PSA/074.usfm | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/19-PSA/037.usfm b/19-PSA/037.usfm
index 975b3065..d83ff6c0 100644
--- a/19-PSA/037.usfm
+++ b/19-PSA/037.usfm
@@ -12,8 +12,8 @@
 
 \s5
 \q
-\v 3 Trust in Yahweh and do what is right;
-\q settle in the land and make faithfulness your business.
+\v 3 Trust in Yahweh and do what is good;
+\q settle in the land and graze in faithfulness.
 \q
 \v 4 Then delight yourself in Yahweh,
 \q and he will give you the desires of your heart.
@@ -29,8 +29,8 @@
 \s5
 \q
 \v 7 Be still before Yahweh and wait patiently for him.
-\q Do not be worry if someone makes his evil ways succeed, 
-\q if a man makes evil plots.
+\q Do not be distressed about the one who succeeds in what he does, 
+\q or when he carries out his evil plans. 
 
 \s5
 \q
diff --git a/19-PSA/074.usfm b/19-PSA/074.usfm
index be389c10..f5160f4a 100644
--- a/19-PSA/074.usfm
+++ b/19-PSA/074.usfm
@@ -85,13 +85,8 @@ 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