finish up the resolve/merge