resolve conflicts with dev branch

layout/includes/additional-js.pug

@@ -60,6 +60,8 @@ div
   if theme.busuanzi.site_uv || theme.busuanzi.site_pv || theme.busuanzi.page_pv
     script(async data-pjax src= theme.asset.busuanzi || '//busuanzi.ibruce.info/busuanzi/2.3/busuanzi.pure.mini.js')
 
+  !=partial('includes/third-party/search/index', {}, {cache: true})
+
   if theme.abcjs.enable
     if theme.abcjs.per_page
       if is_post() || is_page()