Update .gitignore to avoid conflict