Fix flash of wrong merge button state on merge