modify .gitignore - application.yml
resolve merge conflict in .gitignore