Real-time collaboration allows people to resolve a merge conflict together. Check out the video below for demonstration. It shows two people (Alice and Bob) resolving a simple merge conflict using a web-based collaborative merge tool, based on CoRED editor.
More material as well as the release of collaborative mergetool coming "soon". In the meantime, please contact Antti Nieminen for more information.