Add mutt auto_alias file which conflicts on every merge