diff --git a/43-LUK/17.usfm b/43-LUK/17.usfm
index 40985032..ccc9e199 100644
--- a/43-LUK/17.usfm
+++ b/43-LUK/17.usfm
@@ -74,6 +74,9 @@
 
 \s5
 \v 37 His disciples said to him, "Lord, where will this happen?" He replied to them, "Wherever there is a dead body, the vultures will gather to eat it."
+<<<<<<< HEAD
 
 
 text
+=======
+>>>>>>> origin/master