Merge branch 'fix_dlpack_r2.3' of https://github.com/vovallen/tensorflow into fix_dlpack_r2.3

tensorflow/python/tfe_wrapper.cc

@@ -1169,13 +1169,9 @@ PYBIND11_MODULE(_pywrap_tfe, m) {
 
     PyCapsule_SetName(pycapsule.ptr(), "used_dltensor");
     PyCapsule_SetDestructor(pycapsule.ptr(), nullptr);
-<<<<<<< HEAD
-    return py::handle(EagerTensorFromHandle(thandle));
-=======
     
     PyObject* pyhandle = EagerTensorFromHandle(thandle);
     return tensorflow::PyoOrThrow(pyhandle);
->>>>>>> ce9b1295b5... fix
   });
 
   m.def("TFE_Py_RegisterCustomDevice", [](const py::handle& context,