Fixed .gitignore after merge