added a merge