Added support for displaying resolved conflicts in diff panel.
added a space for global utility functions.