diff --git a/19-PSA.usfm b/19-PSA.usfm
index a30069e7..341dd51c 100644
--- a/19-PSA.usfm
+++ b/19-PSA.usfm
@@ -1545,13 +1545,8 @@
 
 \s5
 \q1
-<<<<<<< HEAD
-\v 11 But as for me, I always try to do what is right;
-\q2 act kindly toward me and rescue me.
-=======
 \v 11 But as for me, I always do what is right.
 \q2 So act kindly toward me and rescue me.
->>>>>>> Fixes from Bob Johnson.
 \q1
 \v 12 I stand in places where I am safe,
 \q2 and when all your people gather together, I praise you.