squash the merge