dolt: Cant merge and because dolt does not let me resolve conflicts

I try to merge changes into my main branch:

mnt/findb$ dolt merge schema
Updating d1lhsk9v9m9c0947467q7gs1nroo1q6h..n5crct6h4rh5u1qhduf9j55t9ehs65s4
Unable to stage changes: add and commit to finish merge
error: Failed to commit changes.
cause: schema conflicts for table yfinance_symbol_info:
       	two columns with the name 'start_date'

Ok we got some conflict (which we really should not) but let’s try to resolve them:

/mnt/findb$ dolt status
On branch main
Your branch is up to date with 'origin/main'.
nothing to commit, working tree clean

Looks like we just can’t.

dolt clone adagrad/findb
dolt merge origin/schema