Merging in resolutions to merge