diff --git a/CHANGES.current b/CHANGES.current
index ac448395a..506ba08be 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -15,7 +15,6 @@ Version 1.3.40 (in progress)
 	    run a little faster (in tests with Xapian on x86-64 Ubuntu 9.04,
 	    the stripped wrapper library was 11% smaller and ran 2.7% faster).
 
->>>>>>> .r11195
 2009-04-21: wsfulton
 	    [C#] Fix #2753469 - bool &OUTPUT and bool *OUTPUT typemaps initialisation.