Fixed CMake merge conflict I missed