cleaning up the merge