Fixed some merge problems (?)

	modified:   include/cvt_ros/StereoSubscriber.h
	modified:   src/lib/StereoSubscriber.cpp