revise the merge result