[FIX] some merge conflict