CUDA Version

You have merge issues.