diff --git a/19-PSA/096.usfm b/19-PSA/096.usfm
index 1e173a69..aec08ff3 100644
--- a/19-PSA/096.usfm
+++ b/19-PSA/096.usfm
@@ -29,11 +29,7 @@
 \s5
 \q
 \v 7 Give praise to Yahweh, you clans of peoples,
-<<<<<<< HEAD
-\q give praise to Yahweh glory and strength.
-=======
 \q give praise to Yahweh for his glory and strength.
->>>>>>> origin/master
 \q
 \v 8 Give to Yahweh the glory that his name deserves.
 \q Bring an offering and come into his courts.