Deleted ugly gitignore merge conflict