merged .gitignore file