resolve merge conflict

Author: drwetter

Dockerfile

@@ -2,7 +2,8 @@ FROM alpine:3.11
 
 RUN apk update && \
     apk upgrade && \
-    apk add --no-cache bash procps drill git coreutils libidn curl socat openssl && \
+    apk add bash procps drill git coreutils libidn curl socat openssl && \
+    rm -rf /var/cache/apk/* && \
     addgroup testssl && \
     adduser -G testssl -g "testssl user"  -s /bin/bash -D testssl && \
     ln -s /home/testssl/testssl.sh /usr/local/bin/ && \