Added merge tool to config file