Update .gitignore for merge