Fix bf-opencl after a bogus merge conflict resolution.