Update common.rb

qa/qa/page/project/settings/common.rb

@@ -17,11 +17,7 @@ module QA
           def expand_section(name)
             page.within('#content-body') do
               page.within('section', text: name) do
-<<<<<<< HEAD
-                click_button('Expand')
-=======
                 click_button 'Expand' unless first('button', text: 'Collapse')
->>>>>>> upstream/master
 
                 yield if block_given?
               end