AP_NavEKF-wip : fixed merge errors