diff --git a/logcheck_ignore b/logcheck_ignore
index af4fefb..e6c6027 100644
--- a/logcheck_ignore
+++ b/logcheck_ignore
@@ -242,7 +242,8 @@
 
 #Apr 13 09:42:28 kvarnen saslauthd[620]: pam_unix(:auth): check pass; user unknown
 ^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ saslauthd\[[[:digit:]]+\]: pam_unix\(:auth\): check pass; user unknown
-
+#Aug 23 18:39:24 nada saslauthd[1713]: do_request      : NULL login received
+^\w{3} [ :[:digit:]]{11} [._[:alnum:]-]+ saslauthd\[[[:digit:]]+\]: do_request      : NULL login received
 
 #
 # SM-MTA
diff --git a/testlog b/testlog
index adee018..032e221 100644
--- a/testlog
+++ b/testlog
@@ -1,4 +1,4 @@
-Bara något att missa...
+första raden i loggen
 Mar 16 21:43:05 kvarnen named[8896]: master 66.23.226.92#53 (source 0.0.0.0#0) deleted from unreachable cache
 Mar 16 21:43:05 kvarnen named[8896]: transfer of 'wahlberg.se/IN' from 66.23.226.92#53: connected using 95.170.86.14#37390
 Mar 17 04:51:05 kvarnen freshclam[485]: Empty script main-56.cdiff, need to download entire database
@@ -215,5 +215,9 @@ Aug 16 19:28:06 nada sshd[12135]: Postponed keyboard-interactive/pam for invalid
 Aug 16 21:57:30 nada sshd[26976]: Postponed keyboard-interactive/pam for invalid user support from 103.207.36.244 port 59302 ssh2 [preauth]
 Aug 17 10:52:11 nada sshd[24804]: Received disconnect from 89.97.55.33: 11: disconnected by user [preauth]
 Aug 23 06:06:16 nada suhosin[4003]: ALERT - configured GET variable value length limit exceeded - dropped variable 'page' (attacker '216.172.189.152', file '/home/fredrik/www.wahlis.com/dnsupdate/man.php')
+<<<<<<< HEAD
 Oct 13 08:31:17 kvarnen systemd[1]: Starting Cleanup of Temporary Directories...
 Oct 13 08:31:17 kvarnen systemd[1]: Started Cleanup of Temporary Directories.
+Aug 23 18:39:24 nada saslauthd[1713]: do_request      : NULL login received
+Aug 23 18:39:24 nada fredrik[1713]: Sista raden ska inte synas
+>>>>>>> 758947b6e0908fe0ead9eba0357088b629fbb192