diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
index cdafd8e1bf8b5b79770398f0f5b1dbd87b4d67a6..d42cca5d912243789760f803d70ae0120e95d83f 100644
--- a/spec/controllers/requests_controller_spec.rb
+++ b/spec/controllers/requests_controller_spec.rb
@@ -53,11 +53,8 @@ describe RequestsController do
   it 'should redirect to the page which you called it from ' do
     pending "i need to figure out how to do this"
   end
-<<<<<<< HEAD
 
   it 'should not blow up if there is a problem mid way thru the webfinger process' do
-    pending "i need to do this tomorrow
+    pending "i need to do this tomorrow'
   end
-=======
->>>>>>> EM websocket cleanly merged with master.  webfingering is now async
 end