diff --git a/src/german/ExtendGer.gf b/src/german/ExtendGer.gf
index 1e7d7f3c5..e33ec17fa 100644
--- a/src/german/ExtendGer.gf
+++ b/src/german/ExtendGer.gf
@@ -186,5 +186,4 @@ lin CompoundN a x =
           g = x.g
           } ;
 
->>>>>>> master
 }