resolve merge conflicts

ntachukwu · ntachukwu · commit f5e1d5e408ec · 2022-12-28T14:36:57.000+01:00
diff --git a/pandas/tests/copy_view/test_methods.py b/pandas/tests/copy_view/test_methods.py
@@ -389,4 +389,4 @@ def test_series_set_axis(using_copy_on_write):
     # mutating ser triggers a copy-on-write for the column / block
     ser2.iloc[0] = 0
     assert not np.shares_memory(ser2, ser)
-    tm.assert_series_equal(ser, ser_orig)
+    tm.assert_series_equal(ser, ser_orig)
