Updated diff and merge tools and type