fix: resolve merge conflict markers in uv.lock, requirements.txt, models.py, app.py, env, baseline.csv f2d4f32 StavanKhobare commited on Apr 25