First iteration of the enhanced merge tool