my version tryna merge
app.py merge