be explicit with merge.tool