diff --git a/gliderpy/__init__.py b/gliderpy/__init__.py
index 18770eb..2639ce4 100644
--- a/gliderpy/__init__.py
+++ b/gliderpy/__init__.py
@@ -12,10 +12,6 @@
     "GliderDataFetcher",
     "plot_track",
     "plot_transect",
-<<<<<<< HEAD
-    "plot_cast",
-=======
->>>>>>> 2fe5015a6ade7d18d3150995bdd3ff1b6c7f6da6
     "plot_ts",
     "plot_cast",
 ]
diff --git a/tests/test_plotting.py b/tests/test_plotting.py
index 6528628..9c5f95f 100644
--- a/tests/test_plotting.py
+++ b/tests/test_plotting.py
@@ -77,11 +77,7 @@ def test_plot_transect_size(glider_data):
 
 @pytest.mark.mpl_image_compare(baseline_dir=root.joinpath("baseline/"))
 def test_plot_cast(glider_data):
-<<<<<<< HEAD
     """Test plot_ctd accessor."""
-=======
-    """Test plot_cast accessor."""
->>>>>>> 2fe5015a6ade7d18d3150995bdd3ff1b6c7f6da6
     fig, ax = plot_cast(glider_data, 0, var="temperature", color="blue")
     return fig