diff --git a/spec/system/admin/order_spec.rb b/spec/system/admin/order_spec.rb
index 17fb1d48bf..04776c1aaf 100644
--- a/spec/system/admin/order_spec.rb
+++ b/spec/system/admin/order_spec.rb
@@ -777,12 +777,8 @@ RSpec.describe '
         it "can edit shipping method" do
           visit spree.edit_admin_order_path(order)
 
-<<<<<<< HEAD
           expect(page).not_to have_content different_shipping_method_for_distributor1.name
-=======
-          expect(page).to_not have_content different_shipping_method_for_distributor1.name
           dismiss_warning
->>>>>>> 2ddec2cff4 (Deals with overlapping elements)
 
           find('.edit-method').click