updating autogenerated cmakelist after merge conflict