fixed app.yaml after merge disaster