fix merge app.py