AP_NavEKF: fixed merge error