Add database setup logic
Resolve merge conflicts in app.py