multirotor_pos_control: fixed wrong merging