Fixed app.yaml after merge