Fix .gitignore merging problem