diff --git a/lib/diaspora/markdownify.rb b/lib/diaspora/markdownify.rb
index 6e38faadd..19a1067eb 100644
--- a/lib/diaspora/markdownify.rb
+++ b/lib/diaspora/markdownify.rb
@@ -138,6 +138,10 @@ module Diaspora
           %Q{[#{content}](#{link}#{title_chunk})}
         end
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6b34a2611da25c7af1c2bcd41c3f8cb326df01a7
         return full_document
       end