diff --git a/docs/gotcha.txt b/docs/gotcha.txt
index 790d62dde..678240cb7 100644
--- a/docs/gotcha.txt
+++ b/docs/gotcha.txt
@@ -128,8 +128,6 @@ save you many hours of grief.
       prefix from the filename.
 
 
-
->>>>>>> master
 7.8.0
 --------------------------------------------------------------------