2nd SlideWiki diff/merge module

Summary
Extension of algorithms for automatic merging conflict resolution.