add Diff3 library
merge ways with non-overlapping changes to nodelists