AP_TECS : fixed merge error