adding merge tool to config