Add app.yaml
Merge conflict managed