Conflicts: modules/highgui/include/opencv2/highgui/highgui_c.h modules/highgui/src/cap_dc1394_v2.cpp fix typo