solved a linker error, trying to remove the calibration from the main function
solving a merge conflict, everything is ok
working on template matching
merge conflict solved