mavlink: minor merging bug fixed