diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb
index 2840ba51..94def29b 100644
--- a/lib/jekyll/document.rb
+++ b/lib/jekyll/document.rb
@@ -443,7 +443,11 @@ module Jekyll
         super
       end
     end
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> origin/pull/cleanup-document__post_read
     private # :nodoc:
     def generate_excerpt
       if generate_excerpt?