mid-work on merge tool