fixed merge conflicts

composer.json

@@ -150,8 +150,14 @@
             "drupal/ui_patterns": {
                 "Ui Patterns Views Fixes": "patches/contrib/ui_patterns_views-preview.patch"
             },
+            "drupal/taxonomy_entity_index": {
+                "Fix PHP 8 strict error with arrays": "patches/contrib/taxonomy_entity_index.patch"
+            },
             "drupal/google_tag": {
-                "Prevent google tag conflict": "patches/contrib/google_tag-ga_conflict.patch"
+                "Comment out GA conflict in Google Tag": "patches/contrib/google_tag-ga_conflict.patch"
+            },
+            "seboettg/citeproc-php": {
+                "D8CORE-6866 Non Numeric pages for citation generator": "patches/contrib/citeproc-pages.patch"
             }
         }
     },
@@ -162,8 +168,7 @@
         ],
         "init-lando": [
             "cp lando/example.local.blt.yml blt/local.blt.yml",
-            "blt blt:init:settings",
-            "blt source:build:simplesamlphp-config"
+            "blt blt:init:settings"
         ],
         "new-build": [
             "cp lando/example.local.blt.yml blt/local.blt.yml",
@@ -179,8 +184,8 @@
             "drush -y rsync @diversityworks.prod:%files @diversityworks.local:%files"
         ],
         "sync-dbs": [
-            "drush -y sql:sync @default.local @default.test",
-            "drush -y rsync @default.local:%files @default.test:%files"
+            "drush -y sql:sync @default.dev @default.local",
+            "drush -y sql:sync @diversityworks.dev @diversityworks.local"
         ]
     },
     "autoload": {

patches/contrib/citeproc-pages.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Util/PageHelper.php b/src/Util/PageHelper.php
+index f226abc..ea29486 100644
+--- a/src/Util/PageHelper.php
++++ b/src/Util/PageHelper.php
+@@ -77,7 +77,7 @@ class PageHelper
+
+     private static function renderChicago($from, $to)
+     {
+-        if ($from > 100 && ($from % 100 > 0) && intval(($from / 100), 10) === intval(($to / 100), 10)) {
++        if (is_numeric($from) && is_numeric($to) && $from > 100 && ($from % 100 > 0) && intval(($from / 100), 10) === intval(($to / 100), 10)) {
+             return "".($to % 100);
+         } elseif ($from >= 10000) {
+             return "".($to % 1000);

patches/contrib/taxonomy_entity_index.patch

@@ -0,0 +1,13 @@
+diff --git a/taxonomy_entity_index.module b/taxonomy_entity_index.module
+index 60a2cc2..7ae4d6f 100644
+--- a/taxonomy_entity_index.module
++++ b/taxonomy_entity_index.module
+@@ -68,7 +68,7 @@ function taxonomy_entity_index_entity_update(EntityInterface $entity) {
+   $entity_type_id = $entity->getEntityTypeId();
+   $config = \Drupal::config('taxonomy_entity_index.settings');
+
+-  $entity_types_to_index = $config->get('types');
++  $entity_types_to_index = $config->get('types') ?: [];
+
+   if (!in_array($entity_type_id, $entity_types_to_index)) {
+     return;