Fixed conflict in CMakeLists.txt