diff --git a/doc/source/whatsnew/v0.17.0.txt b/doc/source/whatsnew/v0.17.0.txt
index 8dc38d85e9ff1..ad104303b9dbd 100644
--- a/doc/source/whatsnew/v0.17.0.txt
+++ b/doc/source/whatsnew/v0.17.0.txt
@@ -612,13 +612,11 @@ Performance Improvements
 
 Bug Fixes
 ~~~~~~~~~
-<<<<<<< HEAD
 - Bug in ``DataFrame.to_html(index=False)`` renders unnecessary ``name`` row (:issue:`10344`)
 =======
 
 
 - Bug in ``DataFrame.to_html(index=False)`` renders unnecessary ``name`` row (:issue:`10344`) 
->>>>>>> updating examples and the bug fix
 - Bug in ``DataFrame.apply`` when function returns categorical series. (:issue:`9573`)
 - Bug in ``to_datetime`` with invalid dates and formats supplied (:issue:`10154`)
 - Bug in ``Index.drop_duplicates`` dropping name(s) (:issue:`10115`)
diff --git a/pandas/tests/test_generic.py b/pandas/tests/test_generic.py
index b001386466213..b08faaa2bb7ad 100644
--- a/pandas/tests/test_generic.py
+++ b/pandas/tests/test_generic.py
@@ -799,41 +799,15 @@ def test_nan_interpolate(self):
         tm._skip_if_no_scipy()
         result = s.interpolate(method='polynomial', order=1)
         assert_series_equal(result, expected)
-<<<<<<< HEAD
-<<<<<<< HEAD
-    
-    # GH #10633
-=======
-    # GH #10633: first attempt
->>>>>>> d992cd0... Updated test
-=======
     
     # GH #10633
->>>>>>> 5a5407e... updating examples and the bug fix
-    def test_interpolate_spline(self):
-        np.random.seed(1)
-        s = pd.Series(np.arange(10)**2)
-        s[np.random.randint(0,9,3)] = np.nan
-        with tm.assertRaises(ValueError):
-            s.interpolate(method='spline')
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 027a5e7... Updating based on feedback
-
     def test_interpolate_spline(self):
         np.random.seed(1)
         t = pd.Series(np.arange(10)**2)
         t[np.random.randint(0,9,3)] = np.nan
         with tm.assertRaises(ValueError):
             t.interpolate(method='spline', order=0)
-<<<<<<< HEAD
-=======
->>>>>>> d992cd0... Updated test
-=======
->>>>>>> 027a5e7... Updating based on feedback
-        
-
+    
     def test_nan_irregular_index(self):
         s = Series([1, 2, np.nan, 4], index=[1, 3, 5, 9])
         result = s.interpolate()