fix conflict

Author: charlesdong1991

pandas/tests/test_strings.py

@@ -3444,6 +3444,7 @@ def test_method_on_bytes(self):
                 ['ad', 'be', 'cf'], 'S2').astype(object))
             tm.assert_series_equal(result, expected)
 
+
     @pytest.mark.filterwarnings("ignore: '.' is interpreted as a literal")
     @pytest.mark.parametrize("regex, expected_array", [
         (True, ['foofoofoo', 'foofoofoo']),
@@ -3475,13 +3476,13 @@ def test_replace_warning_single_character(self, input_array,
             result = values.str.replace(single_char, replace_char)
 
         expected = Series([expect_array])
-=======
+        tm.assert_series_equal(result, expected)
+
     @pytest.mark.skipif(compat.PY2, reason='not in python2')
     def test_casefold(self):
         # GH25405
         expected = Series(['ss', NA, 'case', 'ssd'])
         s = Series(['ß', NA, 'case', 'ßd'])
         result = s.str.casefold()
 
->>>>>>> github/master
         tm.assert_series_equal(result, expected)