diff --git a/27-DAN/11.usfm b/27-DAN/11.usfm
index 1cb7b805..3a5d9734 100644
--- a/27-DAN/11.usfm
+++ b/27-DAN/11.usfm
@@ -36,7 +36,11 @@
 \v 14 In those times many will rise against the king of the South. Sons of the violent among your people will set themselves in order to fulfill a vision, but they will stumble.
 
 \s5
+<<<<<<< HEAD
 \v 15 The king of the North will come, pour out earth for siege mounds, and capture city with fortifications. The forces of the South will not be able to stand, not even their best soldiers. There will be no strength to stand.
+=======
+\v 15 The king of the North will come, pour out earth for siege mounds, and capture a city with fortifications. The forces of the South will not be able to stand, not even their best soldiers. There will be no strength to stand.
+>>>>>>> origin/master
 \v 16 Instead, the one who comes will act according to his desires against him; no one will stand in his way. He will stand in the land of beauty, and destruction will be in his hand.
 
 \s5