Fixed merge conflicts with gitignore