Added merge.tool