[FIX] merge error