fix merge conflicts

diff --cc templates/context.json
index 274d7a89747e8c404fe470ce6e203f841d2ff431,be5bd65f7dcf17788fe7979c3fa15f5308d933fc..aa68ba36592711f2aec60dd63ddb37383971e0aa
--- 1/templates/context.json
--- 2/templates/context.json
+++ b/templates/context.json
@@@ -94,10 -91,8 +92,9 @@@
                    "largelogo": "jackdb-logomark-700x200.png",
                    "badgelogo": "jackdb-logomark-700x200.png",
                    "link": "https://www.jackdb.com/",
 +                  "intro": " "
                },
          {
-             "name": "ZomboDB",
              "logo": "zombodb.png",
              "largelogo": "zombodb.png",
              "badgelogo": "zombodb.png",