Updated CMakeLists.txt for build on linux
Fixed merge conflict