fix merge conflict resolution

Author: leofang

cuda_core/tests/test_utils.py

@@ -1025,4 +1025,4 @@ def test_torch_tensor_bridge_dtypes(init_cuda, dtype):
     a = torch.tensor([1, 0, 1], dtype=torch_dtype, device="cuda")
     smv = StridedMemoryView.from_any_interface(a, stream_ptr=0)
     assert smv.dtype.itemsize == a.element_size()
-    assert smv.ptr == a.data_ptr()
+    assert smv.ptr == a.data_ptr()