diff --git a/spec/services/wiki_pages/update_service_spec.rb b/spec/services/wiki_pages/update_service_spec.rb
index b8e7ce4683805d73ba10ba80a12caf0aa3842f9d..f623aece1525371ceb7770b26ce16cfeba9b33f7 100644
--- a/spec/services/wiki_pages/update_service_spec.rb
+++ b/spec/services/wiki_pages/update_service_spec.rb
@@ -25,14 +25,9 @@
       updated_page = service.execute(page)
 
       expect(updated_page).to be_valid
-<<<<<<< HEAD
       expect(updated_page).to have_attributes(message: opts[:message], content: opts[:content], format: opts[:format].to_sym)
-=======
-      expect(updated_page.message).to eq(opts[:message])
-      expect(updated_page.content).to eq(opts[:content])
-      expect(updated_page.format).to eq(opts[:format].to_sym)
+
       expect(updated_page.title).to eq(opts[:title])
->>>>>>> upstream/master
     end
 
     it 'executes webhooks' do