sorting out the merge