[Update] fix the merge