attempting merge resolution