diff --git a/02-EXO/29.usfm b/02-EXO/29.usfm
index 548b1bbd..92e39b1b 100644
--- a/02-EXO/29.usfm
+++ b/02-EXO/29.usfm
@@ -32,11 +32,7 @@
 \s5
 \p
 \v 15 You must also take the one ram, and Aaron and his sons must lay their hands on its head.
-<<<<<<< HEAD
 \v 16 You must kill the ram. Then take its blood and sprinkle it on all sides of the altar.
-=======
-\v 16 You must kill the ram. Then take its blood and sprinkled it against the altar on every side and on it.
->>>>>>> origin/master
 \v 17 You must cut the ram into pieces and wash its inner parts and its legs, and you must put the inner parts, together with its pieces and with its head,
 \v 18 on the altar. Then burn the whole ram. It will be a burnt offering to me, Yahweh. It will produce a sweet aroma for me; it will be an offering made to me by fire.