clean the merge