Aastha
Resolved merge conflict in app.py
ddd99dd