corrected cv2_contrib
conflict resolution