Apply suggestions from code review

Co-authored-by: vlad-perevezentsev <vladislav.perevezentsev@intel.com>

Author: antonwolfy

CHANGELOG.md

@@ -88,12 +88,9 @@ Also, that release drops support for Python 3.9, making Python 3.10 the minimum
 * Resolved an issue with strides calculation in `dpnp.diagonal` to return correct values for empty diagonals [#2814](https://github.com/IntelPython/dpnp/pull/2814)
 * Fixed test tolerance issues for float16 intermediate precision that became visible when testing against conda-forge's NumPy [#2828](https://github.com/IntelPython/dpnp/pull/2828)
 * Ensured device aware dtype handling in `dpnp.identity` and `dpnp.gradient` [#2835](https://github.com/IntelPython/dpnp/pull/2835)
-<<<<<<< matrix-rank-for-empty-array
 * Fixed `dpnp.linalg.matrix_rank` to properly handle an empty input array [#2853](https://github.com/IntelPython/dpnp/pull/2853)
-=======
 * Fixed `dpnp.tensor.round` to use device-aware output dtype for boolean input [#2851](https://github.com/IntelPython/dpnp/pull/2851)
 * Resolved a deadlock in `dpnp.linalg.qr` by releasing the GIL before OneMKL `orgqr` call to prevent host tasks contention [#2850](https://github.com/IntelPython/dpnp/pull/2850)
->>>>>>> master
 
 ### Security
 

dpnp/tests/test_linalg.py

@@ -3265,7 +3265,7 @@ def test_empty(self, shape):
             if expected.ndim == 0:
                 expected = numpy.array(0)
         else:
-            result = numpy.linalg.matrix_rank(a)
+            expected = numpy.linalg.matrix_rank(a)
         assert_array_equal(result, expected, strict=True)
 
         # Also test with hermitian=True