[FIX] fixed merge related bugs