merge resolution.