fix main-kanary merge conflict

package.json

@@ -15,8 +15,8 @@
     "clean-css-cli": "4.3.0",
     "client-oauth2": "4.3.2",
     "concat": "1.0.3",
-    "connect-redis": "5.0.0",
     "cookie-parser": "^1.4.6",
+    "connect-redis": "5.0.0",
     "csurf": "1.11.0",
     "del": "^6.0.0",
     "dotenv": "8.2.0",

template-helpers/hbs-helpers.js

@@ -327,6 +327,6 @@ module.exports = {
   ifCompare,
   breachMath,
   loop,
-  vpnPromoBlocked,
   showCsatBanner,
+  vpnPromoBlocked,
 };

views/partials/header/header.hbs

@@ -1,6 +1,6 @@
     {{> vpn-banner }}
     <header id="header" class="{{ addUpgradeClasses }}">
-      {{{ recruitmentBanner }}}
+      {{!-- {{{ recruitmentBanner }}} --}}
       {{!-- {{{ microsurveyBanner }}} --}}
       {{> csat-banner }}
       <div id="navigation-wrapper" class="{{ addUpgradeClasses }}">