[openFATE 305923] osc revert or merge