Adding some more information about conflict resolution.