Add merge tool configuration