resolved conflicts with HEAD'

README.md

@@ -384,6 +384,7 @@ a specific page. As an example, the tag
 will attempt to read the key `ruby` from file `/home/foo/bar.bib`. It will not
 fallback to the default BibTeX file.
 
+
 #### Citation pointing to another page in your site
 In some cases, you might want your citation to link to another page on your cite (ex. a separate works cited page). As a solution, add a relative path to your scholar configurations:
 
@@ -392,6 +393,7 @@ In some cases, you might want your citation to link to another page on your cite
       relative: "/relative/path/file.html"
 ~~~
 
+
 #### Multiple bibliographies within one document (like [multibib.sty](http://www.ctan.org/pkg/multibib))
 
 When you have multiple `{% bibliography %}` sections in one file,

lib/jekyll/scholar/version.rb

 module Jekyll
   class Scholar
+<<<<<<< HEAD
     VERSION = '5.5.1'.freeze
+=======
+    VERSION = '5.4.1'.freeze
+>>>>>>> a09dbbb0596b2cc73951114a3b5ef2788e6acf37
   end
 end