Removed stray 'conflict resolution' information.