diff --git a/filan.c b/filan.c
index 980b1a9..3465f7c 100644
--- a/filan.c
+++ b/filan.c
@@ -911,7 +911,7 @@ int tcpan2(int fd, FILE *outfile) {
 
    result = Getsockopt(fd, SOL_TCP, TCP_INFO, &tcpinfo, &tcpinfolen);
    if (result < 0) {
-      Debug4("getsockopt(%d, SOL_TCP, TCP_INFO, %p, {"F_socklen"}): %s",
+      Debug4("getsockopt(%d, SOL_TCP, TCP_INFO, %p, {"F_Zu"}): %s",
 	     fd, &tcpinfo, sizeof(tcpinfo), strerror(errno));
       return -1;
    }
diff --git a/test.sh b/test.sh
index ac74f16..c334fbf 100755
--- a/test.sh
+++ b/test.sh
@@ -15340,15 +15340,7 @@ rc1=$?
 kill $pid0 2>/dev/null; wait
 if [ !!! ]; then
     $PRINTF "$OK\n"
-<<<<<<< HEAD
-<<<<<<< HEAD
-    if [" $VERBOSE" ]; then
-=======
     if [ "$VERBOSE" ]; then
->>>>>>> 8e56329... ABSTEACT-LISTEN with option user calls fchown()
-=======
-    if [ "$VERBOSE" ]; then
->>>>>>> 4927d33... Option -R did not only dump right-to-left, but also left-to-right traffic
 	echo "$CMD0 &" >&2
 	echo "$CMD1" >&2
     fi