.gitignore had not merged correctly