more merge resolution