fix the .gitignore file conflict