diff --git a/apps/dashboard/test/system/products_dev_test.rb b/apps/dashboard/test/system/products_dev_test.rb
index a625807176..60e002337d 100644
--- a/apps/dashboard/test/system/products_dev_test.rb
+++ b/apps/dashboard/test/system/products_dev_test.rb
@@ -68,7 +68,6 @@ def setup
     assert_selector 'tr', count: 12
   end
 
-<<<<<<< HEAD
   test 'pressing bundle install' do
     visit(product_url('dev', 'dashboard'))
     assert find('#product_cli_modal', visible: :hidden)
@@ -103,7 +102,6 @@ def setup
     assert find('#product_cli_modal', visible: :visible)
     click_button('product_cli_modal_button')
     assert find('#product_cli_modal', visible: :hidden)
-=======
   test 'picking a new icon' do
     Dir.mktmpdir do |dir|
       FileUtils.cp_r("test/fixtures/sys_with_gateway_apps/dashboard", dir)
@@ -127,6 +125,5 @@ def setup
       assert_equal current_path, product_path('dev', 'dashboard')
       assert_equal expected_manifest, actual_manifest
     end
->>>>>>> 4358621c (add a test case and some small tweaks)
   end
 end