[git] fix conflict by removing dovecot conf files
[git] fix conflict