Fix conflict of .gitignore