Do not keep backups of merge conflicts