AP_NavEKF: fixed merge error on gyro bias log units