diff --git a/docs/config.pod b/docs/config.pod
index e2fbb28..86e0f0b 100644
--- a/docs/config.pod
+++ b/docs/config.pod
@@ -89,11 +89,7 @@ connection before any auth succeeds, defaults to C<0>.
 
 =back
 
-<<<<<<< HEAD
-=head2 Plugin settings
-=======
 =head2 Plugin settings files
->>>>>>> initial import - based on my qpsmtpd fork
 
 =over 4