Fix conflict

docker-compose.yml

@@ -165,11 +165,7 @@ services:
             - sogo
 
     dovecot-mailcow:
-<<<<<<< HEAD
-      image: mailcow/dovecot:1.21
-=======
       image: mailcow/dovecot:1.22
->>>>>>> master
       build: ./data/Dockerfiles/dovecot
       cap_add:
         - NET_BIND_SERVICE