Fix merge problems on state command.