ITS#9329 Re-fix merge_state

A bit uglier but more straightforward.
3 jobs for 9329b in 31 minutes and 23 seconds (queued for 1 second)
latest