update .gitignore to ignore application.yml
fix merge conflict