Fixed .gitignore merge conflict