fix2

Author: shubham11941140

pandas/tests/series/methods/test_replace.py

@@ -518,15 +518,14 @@ def test_pandas_replace_na(self):
         exp = pd.Series(["CC", "CC", "CC-REPL", "DD", "CC", "", pd.NA], dtype="string")
         tm.assert_series_equal(result, exp)
 
-<<<<<<< HEAD
     @pytest.mark.parametrize("regex", [False, True])
     def test_replace_regex_dtype_series(self, regex):
         # GH-48644
         series = pd.Series(["0"])
         expected = pd.Series([1])
         result = series.replace(to_replace="0", value=1, regex=regex)
         tm.assert_series_equal(result, expected)
-=======
+
     @pytest.mark.parametrize(
         "dtype, input_data, to_replace, expected_data",
         [
@@ -613,4 +612,3 @@ def test_replace_nullable_numeric(self):
         assert ints.replace({1: 9.0}).dtype == ints.dtype
         assert ints.replace(1, 9.0).dtype == ints.dtype
         # FIXME: ints.replace({1: 9.5}) raises bc of incorrect _can_hold_element
->>>>>>> 3e9f09fa63c6231a36075317d8cd8bb2f3672901