Fix merge of .gitignore