merge resolution