CMakeLists simple run added
conflicts fixed