merge state machine changes