Completed conflict resolution section.