fix merge errors in offboard.cpp