Fix merge conflicts

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Relax Jekyll dependency to allow for version 4.0.
 
+### Fixed
+- Fix MIME-type issues with Lunr search by renaming `search-data.json` to `lunr/lunr.store.js`. [#82](https://github.com/mmistakes/jekyll-theme-basically-basic/issues/82)
+
 ## [1.4.2] - 2019-07-18
 
 ### Added

_includes/search/lunr-search-scripts.html

@@ -37,7 +37,7 @@
   {%- endcase -%}
   <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
   <script src="{{ '/assets/javascripts/lunr/lunr.min.js' | absolute_url }}"></script>
-  <script src="{{ '/assets/javascripts/search-data.json' | absolute_url }}"></script>
+  <script src="{{ '/assets/javascripts/lunr/lunr.store.js' | absolute_url }}"></script>
   {%- unless lang == "en" -%}
     <script src="{{ '/assets/javascripts/lunr/lunr.stemmer.support.min.js' | absolute_url }}"></script>
     <script src="{{ '/assets/javascripts/lunr/lunr.' | append: lang | append: '.min.js' | absolute_url }}"></script>