AP_AHRS: Fixed merge error