Modify the merge a little