switch back when merged