added close buttons to series resolutions. Moved contourPixmap code to appropriate spot. added button for keeping both conflicting contours and updated the output check accordingly