added sectionContourConflictResolver() class for less chaotic method of solving conflicts