Fix the merge result ....