diff and merge tools, praxis merge