fixing merge
	modified:   CMakeLists.txt