toolbar merge resolution