reimplemented conflict checking and detection of overlapping contours in MergeSection
Merge branch 'mergeObject'