diff --git a/act/13/50.md b/act/13/50.md
index 3c453fa0dc..5846b02f48 100644
--- a/act/13/50.md
+++ b/act/13/50.md
@@ -24,9 +24,5 @@ The word "they" here probably refers to the devout women and the leading men. Th
 
 # region
 
-<<<<<<< HEAD
 Here this word refers to the area that the people of the city considered their own, not to land within an official government border.
 
-=======
-Here this word refers to the area that the people of the city considered their own, not to land within an official government border.
->>>>>>> c18ee64ed3445827e2e16ea2b248c6b375300f7e