removing merge conflict backups