Update gitignore
Merge conflict solved.