add applicaiton.yml to gitignore
fix merge conflict