Removed conflict section.