fix merge conflict

fix conflict in handling HIL in commander.cpp and
state_machine_helper.cp