delete conflicts for gitignore