diff --git a/romancal/resample/tests/test_resample.py b/romancal/resample/tests/test_resample.py
index 2f8cd83f1..2923a2625 100644
--- a/romancal/resample/tests/test_resample.py
+++ b/romancal/resample/tests/test_resample.py
@@ -1039,11 +1039,7 @@ def test_populate_mosaic_basic_different_observations(
         rotation=0,
         shape=None,
         crpix=(0, 0),
-<<<<<<< HEAD
         crval=(30, 45),
-=======
-        crval=(10, 0),
->>>>>>> 001c238 (Adjust crval in resample tests to get overlap with input)
     )
     output_model = maker_utils.mk_datamodel(
         datamodels.MosaicModel, shape=tuple(output_wcs.array_shape)