diff --git a/NEWS b/NEWS
index 24d08eeab..945db7a38 100644
--- a/NEWS
+++ b/NEWS
@@ -112,7 +112,6 @@
 	o weird logic with the 'Edit filter action' dialog
 	o resource leaks; memory corruption
 
->>>>>>> gtk3
 * 4.0.0 / 3.18.0
 ----------------
 
diff --git a/doc/man/claws-mail.1 b/doc/man/claws-mail.1
index 123a4e925..70f484804 100644
--- a/doc/man/claws-mail.1
+++ b/doc/man/claws-mail.1
@@ -261,11 +261,7 @@ Claws Mail output file when \-\-debug is enabled. If
 %TEMP% is not set it defaults to windows directory (usually
 C:\\Windows) or C:\\ if windows directory is not available.
 .TP
-<<<<<<< HEAD
-\fB %APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
-=======
 \fB%APPDATA%\\Claws\-mail\\claws.log \fI(Windows only)\fR
->>>>>>> gtk3
 Claws Mail log file.
 
 .SH "EXAMPLES"