Conflicts when statuses change quickly

Landed in v5.7.0 :tada: