app.yaml conflict resolution