Sophisticated merge tool
