Summary
Extension of algorithms for automatic merging conflict resolution.
More information & hyperlinks