Resolved conflicts turn yellow
reorganized code for sectionContourWidget.showDetails(), added cancel and keepBoth buttons