Fix merge error on .gitignore