rename upset to merge everywhere