fixed cmake to work on fisheye
fixed merges