fixing merge conflicts
updating app.yaml for amysapp