diff --git a/jit/figs-hypo/01.md b/jit/figs-hypo/01.md
index 4114032..cdfb324 100644
--- a/jit/figs-hypo/01.md
+++ b/jit/figs-hypo/01.md
@@ -65,9 +65,6 @@ Use your language's ways of showing these kinds of things.
 
 ### Translation Strategies
 
-<<<<<<< HEAD
 There are no translation strategies for this topic.
-=======
-There are not translation strategies for this topic.
 
->>>>>>> Conform file to have EOL at end
+