[FIX] fix conflicts