added merge tool configuration
initial hack sets