diff --git a/CHANGES.rst b/CHANGES.rst
index 75ba92a..b635899 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -127,7 +127,6 @@ Changelog
 - Put defaultUser.png instead of old defaultUser.gif
   [bsuttor]
 
->>>>>>> master
 - Remove bbb directory. bbb was never really implemented.
   [timo]