diff --git a/app/jobs/xmpp_set_avatar_job.rb b/app/jobs/xmpp_set_avatar_job.rb
index d2f8d23..642225c 100644
--- a/app/jobs/xmpp_set_avatar_job.rb
+++ b/app/jobs/xmpp_set_avatar_job.rb
@@ -57,10 +57,7 @@ class XmppSetAvatarJob < ApplicationJob
       end
     end
 
-<<<<<<< HEAD
-=======
     # See https://xmpp.org/extensions/xep-0084.html
->>>>>>> feature/ejabberd_pep
     def build_xep0084_stanzas
       img_data    = process_avatar
       sha1_hash   = Digest::SHA1.hexdigest(img_data)