diff --git a/tests/test_plots.py b/tests/test_plots.py
index fe40549..944c2ed 100644
--- a/tests/test_plots.py
+++ b/tests/test_plots.py
@@ -80,7 +80,10 @@ def test_ppc(plot_config, mock_model, mock_data, mock_2d_data, result_output):
     plot = PPC(mock_model, mock_data, save=True, show=False)
     plot(**get_item("plots", "PPC", raise_exception=False))
     assert os.path.exists(f"{plot.out_dir}/{plot.plot_name}")
+<<<<<<< HEAD
 
+=======
+>>>>>>> 9d57556 (Update existing plots and metrics to work with 2d #72)
     plot = PPC(
         mock_model,
         mock_2d_data, save=True, show=False, 
@@ -117,4 +120,4 @@ def test_parity(plot_config, mock_model, mock_data):
         include_residual = True, 
         include_percentage = True)
 
-    assert os.path.exists(f"{plot.out_dir}/{plot.plot_name}")
+    assert os.path.exists(f"{plot.out_dir}/{plot.plot_name}")
\ No newline at end of file