From 5103d76b94c5c3ad334a1ae0253b45f25f367f02 Mon Sep 17 00:00:00 2001
From: Ethan Clevenger <ethan.c.clevenger@gmail.com>
Date: Wed, 15 Jan 2025 15:20:03 -0800
Subject: [PATCH] Fix missed merge tags.

---
 templates/cart.json         |  58 ----------
 templates/collection.json   |  35 ------
 templates/index.json        | 213 -----------------------------------
 templates/page.contact.json |  28 -----
 templates/password.json     |  49 --------
 templates/product.json      | 219 ------------------------------------
 6 files changed, 602 deletions(-)

diff --git a/templates/cart.json b/templates/cart.json
index f3ec9f167c7..032596303dd 100644
--- a/templates/cart.json
+++ b/templates/cart.json
@@ -1,59 +1 @@
-<<<<<<< HEAD
 {"sections":{"cart-items":{"type":"main-cart-items","settings":{"padding_top":36,"padding_bottom":36}},"cart-footer":{"type":"main-cart-footer","blocks":{"subtotal":{"type":"subtotal","settings":{}},"buttons":{"type":"buttons","settings":{}}},"block_order":["subtotal","buttons"],"settings":{}}},"order":["cart-items","cart-footer"]}
-=======
-{
-  "sections": {
-    "cart-items": {
-      "type": "main-cart-items",
-      "settings": {
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "cart-footer": {
-      "type": "main-cart-footer",
-      "blocks": {
-        "subtotal": {
-          "type": "subtotal",
-          "settings": {
-          }
-        },
-        "buttons": {
-          "type": "buttons",
-          "settings": {
-          }
-        }
-      },
-      "block_order": [
-        "subtotal",
-        "buttons"
-      ]
-    },
-    "featured-collection": {
-      "type": "featured-collection",
-      "settings": {
-        "title": "Featured collection",
-        "heading_size": "h2",
-        "collection": "all",
-        "products_to_show": 4,
-        "columns_desktop": 4,
-        "color_scheme": "scheme-1",
-        "show_view_all": true,
-        "swipe_on_mobile": false,
-        "image_ratio": "square",
-        "show_secondary_image": false,
-        "show_vendor": false,
-        "show_rating": false,
-        "columns_mobile": "2",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    }
-  },
-  "order": [
-    "cart-items",
-    "cart-footer",
-    "featured-collection"
-  ]
-}
->>>>>>> v15.2.0
diff --git a/templates/collection.json b/templates/collection.json
index f46d4aaf1ef..8d941ef300d 100644
--- a/templates/collection.json
+++ b/templates/collection.json
@@ -1,36 +1 @@
-<<<<<<< HEAD
 {"sections":{"banner":{"type":"main-collection-banner","custom_css":["h1 {padding-top: 1.5em;}"],"settings":{"show_collection_description":true,"show_collection_image":false,"color_scheme":"background-1"}},"product-grid":{"type":"main-collection-product-grid","settings":{"products_per_page":16,"columns_desktop":4,"image_ratio":"adapt","image_shape":"default","show_secondary_image":false,"show_vendor":false,"show_rating":true,"enable_quick_add":true,"enable_filtering":true,"filter_type":"horizontal","enable_sorting":true,"columns_mobile":"2","padding_top":36,"padding_bottom":36}}},"order":["banner","product-grid"]}
-=======
-{
-  "sections": {
-    "banner": {
-      "type": "main-collection-banner",
-      "settings": {
-        "show_collection_description": true,
-        "show_collection_image": false,
-        "color_scheme": "scheme-1"
-      }
-    },
-    "product-grid": {
-      "type": "main-collection-product-grid",
-      "settings": {
-        "products_per_page": 16,
-        "columns_desktop": 4,
-        "image_ratio": "adapt",
-        "show_secondary_image": false,
-        "show_vendor": false,
-        "show_rating": false,
-        "enable_filtering": true,
-        "enable_sorting": true,
-        "columns_mobile": "2",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    }
-  },
-  "order": [
-    "banner",
-    "product-grid"
-  ]
-}
->>>>>>> v15.2.0
diff --git a/templates/index.json b/templates/index.json
index cdac3c33aa7..be4fd1982d7 100644
--- a/templates/index.json
+++ b/templates/index.json
@@ -1,214 +1 @@
-<<<<<<< HEAD
 {"sections":{"a38fa32f-3c1d-4fec-bb2e-0e0c6eca8835":{"type":"custom-liquid","custom_css":[".hero,.text {position: relative; overflow: hidden;}","h1,h2 {font-weight: 400;}","h2,p {color: white;}","h1 {color: #e4db77; margin: 0; line-height: 1;}","h2 {margin-top: 0;}",".video {position: absolute; min-width: 100%; min-height: 100%; object-fit: cover;}",".text {background: rgba(17, 65, 76, 0.81); padding: 5%;}","@media only screen and (min-width: 750px) {h1 {font-size: 6.25vw; } h1 .stretch {font-size: 9.6vw; } h2 {font-size: 3.13vw; } p {max-width: 38.5vw; }}","@media only screen and (max-width: 749px) {.text {padding: 20% 5%; }}"],"settings":{"custom_liquid":"<div class=\"hero\">\n<video autoplay muted loop class=\"video\">\n  <source src=\"https:\/\/cdn.shopify.com\/videos\/c\/o\/v\/a54070a448ff4915afe28d8e8ba68438.mp4\n\" type=\"video\/mp4\">\n<\/video>\n<div class=\"text\"><h1>Farmers<br><span class=\"stretch\">Union<\/span><\/h1>\n<h2>Coffee Roasters<\/h2>\n<p>Located in the historic Farmers Union Marketplace in Eugene, Oregon. We roast great coffee with love for the common good. <\/p>\n<\/div>\n<\/div>","color_scheme":"background-1","padding_top":0,"padding_bottom":0}},"366471fe-cb54-460a-8a19-430bffb224ef":{"type":"custom-liquid","custom_css":["li:first-child {max-width: 100%;}",".big {display: block; margin: 0 auto; font-size: clamp(70px, 15vw, 180px); line-height: 1; color: #9c3d3d;}","@media screen and (min-width: 750px) {.big {word-wrap: break-word; } .big, li:nth-child(2) {max-width: clamp(140px, 30vw, 360px); }}","@media screen and (max-width: 749px) {li:nth-child(2) {max-width: none; } a.button {margin-top: 15px; width: 100%; } h2 {text-align: center; }}"],"settings":{"custom_liquid":"<div class=\"multicolumn background-none no-heading\">\n  <div class=\"page-width section-template--14646129197122__4d0d1064-9619-4144-adfc-e200e57ad0a7-padding isolate\"><slider-component class=\"slider-mobile-gutter\">\n      <ul class=\"multicolumn-list contains-content-container grid grid--1-col-tablet-down grid--2-col-desktop\" id=\"Slider-template--14646129197122__4d0d1064-9619-4144-adfc-e200e57ad0a7\" role=\"list\"><li id=\"Slide-template--14646129197122__4d0d1064-9619-4144-adfc-e200e57ad0a7-1\" class=\"multicolumn-list__item grid__item\">\n            <div class=\"multicolumn-card content-container\">\n                <div class=\"multicolumn-card__image-wrapper multicolumn-card__image-wrapper--full-width multicolumn-card-spacing\">\n                  <div class=\"media media--transparent media--adapt\" style=\"padding-bottom: 100.0%;\">\n                    <img src=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=3200\" alt=\"\" srcset=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=50 50w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=75 75w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=100 100w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=150 150w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=200 200w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=300 300w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=400 400w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=500 500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=750 750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=1000 1000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=1250 1250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=1500 1500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=1750 1750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=2000 2000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=2250 2250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=2500 2500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=2750 2750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=3000 3000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/FUCR_20230222_hero_images-0021-square-min-1-1024x1024.jpg?v=1685991563&amp;width=3200 3200w\" loading=\"lazy\" sizes=\"\n                      (min-width: 1200px) calc((1200px - 108px) * 1 \/  2),\n                      (min-width: 990px) calc((100vw - 108px) * 1 \/ 2),\n                      (min-width: 750px) calc((100vw - 100px) * 1 \/ 1),\n                      calc((100vw - 30px) * 1 \/ 1)\n                    \" class=\"multicolumn-card__image\" width=\"3200\" height=\"3200\">\n                  <\/div>\n                <\/div><div class=\"multicolumn-card__info\"><\/div>\n            <\/div>\n          <\/li><li id=\"Slide-template--14646129197122__4d0d1064-9619-4144-adfc-e200e57ad0a7-2\" class=\"multicolumn-list__item grid__item\">\n            <div class=\"multicolumn-card content-container\"><div class=\"multicolumn-card__info\"><h2 class=\"inline-richtext\"><span class=\"big\">Shop <\/span><br>Welcome To Farmers Union<\/h2><div class=\"rte\"><p>Coffees sourced from around the world and roasted to the peak of their sweetness.<\/p><\/div><a class=\"button button--primary\" href=\"\/collections\/let-us-handle-the-coffee\">Shop Now<\/a><\/div>\n            <\/div>\n          <\/li><\/ul><\/slider-component>\n    <div class=\"center\"><\/div>\n  <\/div>\n<div><\/div><\/div>","color_scheme":"background-2","padding_top":100,"padding_bottom":100}},"f7f2a36a-73b0-41d6-97e9-22d6de1552c4":{"type":"multicolumn","blocks":{"template--14646129197122__f7f2a36a-73b0-41d6-97e9-22d6de1552c4-16859892538c7f487d-0":{"type":"column","settings":{"title":"It's the best kept secret in Oregon","text":"","link_label":"","link":""}},"template--14646129197122__f7f2a36a-73b0-41d6-97e9-22d6de1552c4-16859892538c7f487d-1":{"type":"column","settings":{"title":"","text":"<p>You heard it here first! Our monthly subscription service is more than just making sure you never run out of fresh coffee in the morning—it’s about delighting your senses, inspiring your adventurous side with a new taste every month, and most importantly, it’s about connection. We strive to connect the farmers who grow and process our coffees with all of our wonderful friends here in Eugene. Join us!<\/p>","link_label":"","link":""}}},"block_order":["template--14646129197122__f7f2a36a-73b0-41d6-97e9-22d6de1552c4-16859892538c7f487d-0","template--14646129197122__f7f2a36a-73b0-41d6-97e9-22d6de1552c4-16859892538c7f487d-1"],"custom_css":["h3 {font-size: 28px;}","@media screen and (min-width: 750px) {li:first-of-type {flex-shrink: 1; flex-basis: auto; width: 25%; max-width: none; flex-grow: 0; } li:nth-of-type(2) {max-width: none; }}"],"settings":{"title":"","heading_size":"h1","image_width":"full","image_ratio":"adapt","columns_desktop":2,"column_alignment":"left","background_style":"none","button_label":"","button_link":"","color_scheme":"background-1","columns_mobile":"1","swipe_on_mobile":false,"padding_top":100,"padding_bottom":32}},"c4ccbf86-b17a-4679-88fd-46b6f7f3fee1":{"type":"multicolumn-with-backgrounds","blocks":{"template--14646129197122__c4ccbf86-b17a-4679-88fd-46b6f7f3fee1-1686177618c5a9740b-1":{"type":"column","settings":{"image":"shopify:\/\/shop_images\/FUCR_20230222_hero_images-0073-scaled-q61fh1ig82etz8egcl90byy44wdxiu0qzvuk7vexrk.jpg","title":"Subscribe","subtitle":"For the Adventure Seeker","text":"<p>Are you a coffee connoisseur that loves a good surprise? Sign up for our Adventure Series and let us amaze you. Each delivery will feature meticulously sourced and expertly roasted single-origin micro-lots from around the world.<\/p>","link_label":"Shop Now","link":"shopify:\/\/products\/roasters-choice-coffee-subscription","color_scheme":"background-2"}},"template--14646129197122__c4ccbf86-b17a-4679-88fd-46b6f7f3fee1-1686177618c5a9740b-0":{"type":"column","settings":{"image":"shopify:\/\/shop_images\/FUCR_20230222_hero_images-0063-scaled-q61fh4byskioy2acw4gw1g8hx2015xby09t0npar8w.jpg","title":"Subscribe","subtitle":"For Families","text":"<p>Looking for a daily drinker that’s approachable, but still full of flavor? Our Family Series is here for it. Enjoy our deeply noted coffees that are likely please everyone. Roasted to taste great with or without cream and sugar. <\/p>","link_label":"Shop Now","link":"https:\/\/www.farmersunioncoffee.com\/products\/family-series-coffee-subscription","color_scheme":"accent-1"}}},"block_order":["template--14646129197122__c4ccbf86-b17a-4679-88fd-46b6f7f3fee1-1686177618c5a9740b-1","template--14646129197122__c4ccbf86-b17a-4679-88fd-46b6f7f3fee1-1686177618c5a9740b-0"],"custom_css":["ul.grid {column-gap: 0;}","li:nth-child(2) .multicolumn-card {background: #678991; color: white;}",".multicolumn-card h2,.multicolumn-card h3,.multicolumn-card a {color: white;}"],"settings":{"title":"","heading_size":"h1","image_width":"full","image_ratio":"adapt","columns_desktop":2,"column_alignment":"left","background_style":"primary","button_label":"","button_link":"","color_scheme":"background-1","columns_mobile":"1","swipe_on_mobile":false,"padding_top":0,"padding_bottom":100}},"ec77f183-b7fe-4b67-a015-98dc19781837":{"type":"multicolumn","blocks":{"a735867e-7997-4f5d-be34-c728202eb007":{"type":"column","settings":{"title":"Try something new","text":"","link_label":"","link":""}},"9b226b81-291a-45f9-8f60-7b17272f882a":{"type":"column","settings":{"title":"","text":"<p>We are constantly exploring the world for the most delicious, ripe, and in season coffees to share with you. As the seasons change, so will the coffees we share.  There's always something fresh and new to enjoy at Farmers Union Coffee Roasters.<\/p>","link_label":"","link":""}}},"block_order":["a735867e-7997-4f5d-be34-c728202eb007","9b226b81-291a-45f9-8f60-7b17272f882a"],"custom_css":["h3 {font-size: 28px;}","@media screen and (min-width: 750px) {li:first-of-type {flex-shrink: 1; flex-basis: auto; width: 25%; max-width: none; flex-grow: 0; } li:nth-of-type(2) {max-width: none; }}"],"settings":{"title":"","heading_size":"h1","image_width":"full","image_ratio":"adapt","columns_desktop":2,"column_alignment":"left","background_style":"none","button_label":"","button_link":"","color_scheme":"background-1","columns_mobile":"1","swipe_on_mobile":false,"padding_top":100,"padding_bottom":0}},"37b1b626-86f5-42d4-88f3-dc0fd09bf395":{"type":"featured-collection","custom_css":["li .card-wrapper .card--card.gradient {background: rgb(var(--color-background));}"],"settings":{"title":"","heading_size":"h1","description":"","show_description":false,"description_style":"body","collection":"new-coffees","products_to_show":2,"columns_desktop":2,"full_width":false,"show_view_all":false,"view_all_style":"solid","enable_desktop_slider":false,"color_scheme":"background-1","image_ratio":"portrait","image_shape":"default","show_secondary_image":false,"show_vendor":false,"show_rating":false,"enable_quick_add":true,"columns_mobile":"2","swipe_on_mobile":true,"padding_top":0,"padding_bottom":100}},"2556b897-8fa3-4766-90a2-02bffd5ee06a":{"type":"custom-liquid","custom_css":[".multicolumn-list .multicolumn-list {justify-content: flex-end;}",".multicolumn-list h2 {margin: 0;}",".multicolumn-list p:not(:first-child) {margin-top: revert;}","@media screen and (min-width: 750px) {.pt > li:first-child {flex: 0 1 auto; width: 25%; max-width: none; } .pt > li:nth-child(2) {max-width: none; }}","@media screen and (min-width: 990px) {.grid__item.ch {width: calc( 33.33% - var(--grid-desktop-horizontal-spacing) * 2 \/ 3 ) !important; max-width: calc( 33.33% - var(--grid-desktop-horizontal-spacing) * 2 \/ 3 ) !important; }}"],"settings":{"custom_liquid":"<div class=\"multicolumn color-background-1 gradient background-none no-heading\">\n  <div class=\"page-width section-template--14646129197122__8aec1ce1-235c-491c-9a67-0d96325fddfb-padding isolate\"><slider-component class=\"slider-mobile-gutter\">\n      <ul class=\"multicolumn-list pt contains-content-container grid grid--1-col-tablet-down grid--2-col-desktop\" id=\"Slider-template--14646129197122__8aec1ce1-235c-491c-9a67-0d96325fddfb\" role=\"list\"><li id=\"Slide-template--14646129197122__8aec1ce1-235c-491c-9a67-0d96325fddfb-1\" class=\"multicolumn-list__item grid__item\">\n            <div class=\"multicolumn-card content-container\"><div class=\"multicolumn-card__info\"><h2 style=\"font-size:28px;\" class=\"inline-richtext\">We work for the farmers, the planet, and our community. We work for you.<\/h2><\/div>\n            <\/div>\n          <\/li><li id=\"Slide-template--14646129197122__8aec1ce1-235c-491c-9a67-0d96325fddfb-2\" class=\"multicolumn-list__item grid__item\">\n            <div class=\"multicolumn-card content-container\"><div class=\"multicolumn-card__info\"><div class=\"rte\"><p>We’re not just a coffee shop. Or a coffee roaster. We’re your neighbors, We’re a place to come together, build community and inspire each other. We believe that good coffee impacts so much and so many. We believe good coffee changes everything. It changes you, the person drinking it. And we believe that when you’re genuinely happy, you can do amazing things. Good coffee changes farmers. It’s true! When you think about it, harvesting the finest coffee doesn’t just happen—it takes great care and ingenuity from entire families and communities for generations. We think that’s pretty cool. And we want to support them. We think coffee roasting is a meticulous art that brings people joy, and our job is to make you proud to call Eugene home.<\/p>\n<p>Named Best Coffee Shop by Eugene Weekly. <\/p>\n<\/div><\/div>\n            <\/div>\n<div class=\"multicolumn color-background-1 gradient background-none no-heading\">\n  <slider-component class=\"slider-mobile-gutter\">\n      <ul style=\"margin-top:2em;\" class=\"multicolumn-list contains-content-container grid grid--1-col-tablet-down grid--3-col-desktop\" id=\"Slider-template--14646129197122__52ca2b62-baab-4828-bd76-165cba7742c4\" role=\"list\"><li id=\"Slide-template--14646129197122__52ca2b62-baab-4828-bd76-165cba7742c4-1\" class=\"multicolumn-list__item color-background-1 grid__item ch\">\n            <div class=\"multicolumn-card content-container\">\n                <div class=\"multicolumn-card__image-wrapper multicolumn-card__image-wrapper--full-width multicolumn-card-spacing\">\n                  <div class=\"media media--transparent media--adapt\" style=\"padding-bottom: 94.6236559139785%;\">\n                    <img src=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200\" alt=\"\" srcset=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=50 50w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=75 75w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=100 100w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=150 150w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=200 200w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=300 300w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=400 400w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=500 500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=750 750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1000 1000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1250 1250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1500 1500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1750 1750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2000 2000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2250 2250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2500 2500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2750 2750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3000 3000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200 3200w\" loading=\"lazy\" sizes=\"\n                      (min-width: 1100px) calc((1100px - 184px) * 1 \/  4),\n                      (min-width: 990px) calc((100vw - 184px) * 1 \/ 4),\n                      (min-width: 750px) calc((100vw - 100px) * 1 \/ 1),\n                      calc((100vw - 30px) * 1 \/ 1)\n                    \" class=\"multicolumn-card__image\" width=\"3200\" height=\"3028\">\n                  <\/div>\n                <\/div><div class=\"multicolumn-card__info\"><h3 class=\"inline-richtext\">We believe that small farms make the world a better place.<\/h3><div class=\"rte\">The coffee we offer is all about the people who grow it. We work with producers that are all about sustainable agriculture - and producing excellent coffee.<\/div><\/div>\n            <\/div>\n          <\/li><li id=\"Slide-template--14646129197122__52ca2b62-baab-4828-bd76-165cba7742c4-2\" class=\"multicolumn-list__item color-background-1 grid__item ch\">\n            <div class=\"multicolumn-card content-container\">\n                <div class=\"multicolumn-card__image-wrapper multicolumn-card__image-wrapper--full-width multicolumn-card-spacing\">\n                  <div class=\"media media--transparent media--adapt\" style=\"padding-bottom: 94.6236559139785%;\">\n                    <img src=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200\" alt=\"\" srcset=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=50 50w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=75 75w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=100 100w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=150 150w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=200 200w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=300 300w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=400 400w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=500 500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=750 750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1000 1000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1250 1250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1500 1500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1750 1750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2000 2000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2250 2250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2500 2500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2750 2750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3000 3000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200 3200w\" loading=\"lazy\" sizes=\"\n                      (min-width: 1100px) calc((1100px - 184px) * 1 \/  4),\n                      (min-width: 990px) calc((100vw - 184px) * 1 \/ 4),\n                      (min-width: 750px) calc((100vw - 100px) * 1 \/ 1),\n                      calc((100vw - 30px) * 1 \/ 1)\n                    \" class=\"multicolumn-card__image\" width=\"3200\" height=\"3028\">\n                  <\/div>\n                <\/div><div class=\"multicolumn-card__info\"><h3 class=\"inline-richtext\">We roast coffee to the very peak of sweetness<\/h3><div class=\"rte\">We see a future where people are connected by their love for coffee and a better world - and we're on a mission to make that happen.<\/div><\/div>\n            <\/div>\n          <\/li><li id=\"Slide-template--14646129197122__52ca2b62-baab-4828-bd76-165cba7742c4-3\" class=\"multicolumn-list__item color-background-1 grid__item ch\">\n            <div class=\"multicolumn-card content-container\">\n                <div class=\"multicolumn-card__image-wrapper multicolumn-card__image-wrapper--full-width multicolumn-card-spacing\">\n                  <div class=\"media media--transparent media--adapt\" style=\"padding-bottom: 94.6236559139785%;\">\n                    <img src=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200\" alt=\"\" srcset=\"\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=50 50w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=75 75w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=100 100w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=150 150w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=200 200w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=300 300w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=400 400w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=500 500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=750 750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1000 1000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1250 1250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1500 1500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=1750 1750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2000 2000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2250 2250w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2500 2500w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=2750 2750w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3000 3000w, \/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/icon.svg?v=1686181804&amp;width=3200 3200w\" loading=\"lazy\" sizes=\"\n                      (min-width: 1100px) calc((1100px - 184px) * 1 \/  4),\n                      (min-width: 990px) calc((100vw - 184px) * 1 \/ 4),\n                      (min-width: 750px) calc((100vw - 100px) * 1 \/ 1),\n                      calc((100vw - 30px) * 1 \/ 1)\n                    \" class=\"multicolumn-card__image\" width=\"3200\" height=\"3028\">\n                  <\/div>\n                <\/div><div class=\"multicolumn-card__info\"><h3 class=\"inline-richtext\">We're here to help you discover great coffee<\/h3><div class=\"rte\">We're constantly striving to find the best coffee out there to share with you. We want every new bag of Farmers Union coffee you try to be an exciting discovery.<\/div><\/div>\n            <\/div>\n          <\/li><\/ul>\n<\/div>\n          <\/li><\/ul><\/slider-component>\n  <\/div>\n<\/div>","color_scheme":"background-1","padding_top":88,"padding_bottom":88}},"1b3a1d2c-ac70-422e-b5c5-0bc229333345":{"type":"custom-liquid","disabled":true,"custom_css":["* {background-image: url(https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/farmers-union-pattern-3.svg); background-color: #f2e9e0; background-size: auto;}",".learn-about-box {display: flex; justify-content: space-evenly; align-items: center;}",".arrows {display: inline-block; height: 50px;}",".arrow-links a {display: inline-block; font-size: 2rem; font-family: \"Ancho\"; color: #11414d; text-decoration: none;}","h2 {font-size: 3rem; color: #11414d;}"],"settings":{"custom_liquid":"<div class=\"learn-about-box\">\n<h2 class=\"vert-text\">Learn<br> about <br>coffee<\/h2>\n<div class=\"arrow-links\">\n<a href=\"url\">Origin Stories<\/a><img class=\"arrows\" src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/Arrow-Right-Toward.svg?v=1685142664\">\n<\/div>\n<div class=\"arrow-links\">\n<a href=\"url\">Brewing Recipes<\/a><img class=\"arrows\" src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/Arrow-Right-Toward.svg?v=1685142664\">\n<\/div>\n<\/div>","color_scheme":"background-1","padding_top":16,"padding_bottom":0}},"05742099-22b5-4306-aa92-8913b640813c":{"type":"custom-liquid","disabled":true,"settings":{"custom_liquid":"","color_scheme":"background-1","padding_top":40,"padding_bottom":52}},"51c0b2e4-45c3-4388-8b32-c6f58712bcde":{"type":"featured-blog","custom_css":[".blog {background-image: url(https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/farmers-union-pattern-7_477cc41c-1296-4807-b204-0c55efe53870.png) !important; background-size: 192px; background-attachment: initial;}"],"settings":{"heading":"learn more","heading_size":"h1","blog":"news","post_limit":3,"columns_desktop":3,"color_scheme":"scheme-65ef8178-55f3-4a58-aaa4-f566df747919","show_image":true,"show_date":true,"show_author":false,"show_view_all":true,"padding_top":100,"padding_bottom":100}},"7deb217c-7982-40ec-9bac-db71d6b6f779":{"type":"image-with-text","blocks":{"template--14646129197122__7deb217c-7982-40ec-9bac-db71d6b6f779-16843545553d1d39f8-0":{"type":"heading","settings":{"heading":"OUR HAPPY CUSTOMERS","heading_size":"h1"}}},"block_order":["template--14646129197122__7deb217c-7982-40ec-9bac-db71d6b6f779-16843545553d1d39f8-0"],"custom_css":[],"settings":{"image":"shopify:\/\/shop_images\/farmers-union-customers-min.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"c72c8bb7-e8bd-4619-9795-25e43a4528cc":{"type":"multicolumn","blocks":{"template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-0":{"type":"column","settings":{"title":"","text":"<p>\"Popped in for breakfast on a Saturday morning. Service was super efficient and everyone was quite nice. The iced coffee was strong but not bitter at all, and we were full from a bacon burrito and avocado bagel. Also got a bag of coffee beans as a gift for my mom because we enjoyed the coffee so much. Super welcoming atmosphere and is situated next to a high end thrift, ‘Oak Street Vintage.’ Until next time!\"<\/p><p><em>-Ally Ruiz Balcerzak<\/em><\/p>","link_label":"","link":""}},"template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-1":{"type":"column","settings":{"title":"","text":"<p>\"As someone who appreciates certain qualities and details that make up a great coffee shop, I'm here to tell you this place hits all the basic marks with ease, and is one of the most satisfying places I've been in a long time.\"<\/p><p><em>-Carrie Beth McWithey<\/em><\/p>","link_label":"","link":""}},"template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-2":{"type":"column","settings":{"title":"","text":"<p>\"Charming coffee shop with terrific coffee and food, adjacent parking and lots of seating. The space inside and out is clean and has tons of character. We ordered two oat milk lattes which were delicious. Nice selection of breakfast treats. The frittata sandwich was yummy.\"<\/p><p><em>-Chris Roddle<\/em><\/p>","link_label":"","link":""}},"495d9e4b-8853-41c4-bcf2-b2e7bd47c345":{"type":"column","settings":{"title":"","text":"<p>\"Holy cow, how is this not 5 stars. This is the best latte and breakfast sandwiches we’ve ever had. The biscuits are incredible, the sandwiches are some of the best we’ve had, the coffee is awesome, the service is above and beyond. This place deserves to be 5 stars and definitely come here.\"<\/p><p><em>-Jillie Johnston<\/em><br\/><\/p>","link_label":"","link":""}}},"block_order":["template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-0","template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-1","template--14646129197122__c72c8bb7-e8bd-4619-9795-25e43a4528cc-1684873350930a6a0f-2","495d9e4b-8853-41c4-bcf2-b2e7bd47c345"],"settings":{"title":"","heading_size":"h1","image_width":"full","image_ratio":"adapt","columns_desktop":4,"column_alignment":"left","background_style":"none","button_label":"","button_link":"","color_scheme":"background-1","columns_mobile":"1","swipe_on_mobile":false,"padding_top":36,"padding_bottom":36}}},"order":["a38fa32f-3c1d-4fec-bb2e-0e0c6eca8835","366471fe-cb54-460a-8a19-430bffb224ef","f7f2a36a-73b0-41d6-97e9-22d6de1552c4","c4ccbf86-b17a-4679-88fd-46b6f7f3fee1","ec77f183-b7fe-4b67-a015-98dc19781837","37b1b626-86f5-42d4-88f3-dc0fd09bf395","2556b897-8fa3-4766-90a2-02bffd5ee06a","1b3a1d2c-ac70-422e-b5c5-0bc229333345","05742099-22b5-4306-aa92-8913b640813c","51c0b2e4-45c3-4388-8b32-c6f58712bcde","7deb217c-7982-40ec-9bac-db71d6b6f779","c72c8bb7-e8bd-4619-9795-25e43a4528cc"]}
-=======
-{
-  "sections": {
-    "image_banner": {
-      "type": "image-banner",
-      "blocks": {
-        "heading": {
-          "type": "heading",
-          "settings": {
-            "heading": "Image banner",
-            "heading_size": "h0"
-          }
-        },
-        "text": {
-          "type": "text",
-          "settings": {
-            "text": "Give customers details about the banner image(s) or content on the template.",
-            "text_style": "body"
-          }
-        },
-        "button": {
-          "type": "buttons",
-          "settings": {
-            "button_label_1": "Shop all",
-            "button_link_1": "shopify://collections/all",
-            "button_style_secondary_1": true,
-            "button_label_2": "",
-            "button_link_2": "",
-            "button_style_secondary_2": false
-          }
-        }
-      },
-      "block_order": [
-        "heading",
-        "text",
-        "button"
-      ],
-      "settings": {
-        "image_overlay_opacity": 40,
-        "image_height": "large",
-        "desktop_content_position": "bottom-center",
-        "show_text_box": false,
-        "desktop_content_alignment": "center",
-        "color_scheme": "scheme-3",
-        "mobile_content_alignment": "center",
-        "stack_images_on_mobile": false,
-        "show_text_below": false
-      }
-    },
-    "rich_text": {
-      "type": "rich-text",
-      "blocks": {
-        "heading": {
-          "type": "heading",
-          "settings": {
-            "heading": "Talk about your brand",
-            "heading_size": "h1"
-          }
-        },
-        "text": {
-          "type": "text",
-          "settings": {
-            "text": "<p>Share information about your brand with your customers. Describe a product, make announcements, or welcome customers to your store.<\/p>"
-          }
-        }
-      },
-      "block_order": [
-        "heading",
-        "text"
-      ],
-      "settings": {
-        "color_scheme": "scheme-1",
-        "full_width": true,
-        "padding_top": 40,
-        "padding_bottom": 0
-      }
-    },
-    "featured_collection": {
-      "type": "featured-collection",
-      "settings": {
-        "title": "Featured products",
-        "heading_size": "h2",
-        "collection": "all",
-        "products_to_show": 8,
-        "columns_desktop": 4,
-        "color_scheme": "scheme-1",
-        "show_view_all": false,
-        "swipe_on_mobile": false,
-        "image_ratio": "adapt",
-        "show_secondary_image": true,
-        "show_vendor": false,
-        "show_rating": false,
-        "columns_mobile": "2",
-        "padding_top": 28,
-        "padding_bottom": 36
-      }
-    },
-    "collage": {
-      "type": "collage",
-      "blocks": {
-        "collection-0": {
-          "type": "collection",
-          "settings": {
-            "collection": ""
-          }
-        },
-        "product": {
-          "type": "product",
-          "settings": {
-            "product": "",
-            "second_image": false
-          }
-        },
-        "collection-1": {
-          "type": "collection",
-          "settings": {
-            "collection": ""
-          }
-        }
-      },
-      "block_order": [
-        "collection-0",
-        "product",
-        "collection-1"
-      ],
-      "settings": {
-        "heading": "Multimedia collage",
-        "heading_size": "h2",
-        "desktop_layout": "left",
-        "mobile_layout": "collage",
-        "color_scheme": "scheme-1",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "video": {
-      "type": "video",
-      "settings": {
-        "heading": "",
-        "video_url": "https://www.youtube.com/watch?v=_9VUPq3SxOc",
-        "heading_size": "h1",
-        "description": "",
-        "full_width": false,
-        "color_scheme": "scheme-1",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "multicolumn": {
-      "type": "multicolumn",
-      "blocks": {
-        "column1": {
-          "type": "column",
-          "settings": {
-            "title": "Column",
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "link_label": "",
-            "link": ""
-          }
-        },
-        "column2": {
-          "type": "column",
-          "settings": {
-            "title": "Column",
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "link_label": "",
-            "link": ""
-          }
-        },
-        "column3": {
-          "type": "column",
-          "settings": {
-            "title": "Column",
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "link_label": "",
-            "link": ""
-          }
-        }
-      },
-      "block_order": [
-        "column1",
-        "column2",
-        "column3"
-      ],
-      "settings": {
-        "title": "",
-        "heading_size": "h1",
-        "image_width": "third",
-        "image_ratio": "adapt",
-        "columns_desktop": 3,
-        "column_alignment": "center",
-        "background_style": "none",
-        "button_label": "",
-        "button_link": "",
-        "swipe_on_mobile": false,
-        "color_scheme": "scheme-1",
-        "columns_mobile": "1",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    }
-  },
-  "order": [
-    "image_banner",
-    "rich_text",
-    "featured_collection",
-    "collage",
-    "video",
-    "multicolumn"
-  ]
-}
->>>>>>> v15.2.0
diff --git a/templates/page.contact.json b/templates/page.contact.json
index 4719d04495c..ac27870e268 100644
--- a/templates/page.contact.json
+++ b/templates/page.contact.json
@@ -1,29 +1 @@
-<<<<<<< HEAD
 {"sections":{"6d46c1b3-2294-4b73-a95d-d8794f3299ab":{"type":"custom-liquid","custom_css":[".text-container {display: flex;}","h2 {word-break: keep-all; padding: 7%; color: #11414d; font-size: 3rem;}","p {padding-right: 10%; padding-left: 10%;}"],"settings":{"custom_liquid":"<div class=\"text-container\">\n<h2>Wholesale<\/h2>\n<p>We offer wholesale programs that are as unique as your needs. We believe that no one company can do it all, so our focus is on being a part of the bigger coffee community here in Eugene. We support the development of specialty coffee through partnerships with coffee professionals and passionate businesses from all walks of life. Our team has been working hard to build a strong foundation for our business from the ground up; we’re actively seeking out new partnerships with local businesses who share our passion for quality coffee and customer service. We are excited to grow with you as we continue to expand our offerings.<\/p>\n<\/div>\n\n<\/div>","color_scheme":"background-1","padding_top":40,"padding_bottom":52}},"5dc1ef4e-5388-4985-994e-3cc53bd054c0":{"type":"custom-liquid","custom_css":[".text-lists {display: flex; align-items: left; justify-content: center;}","li {list-style-type: none; margin: 15px 20px; padding: 0 20px; text-align: left;}",".title {font-family: \"ancho\"; line-height: inherit; color: #11414d;}"],"settings":{"custom_liquid":"<div class=\"text-lists\">\n<div class=\"list-1\">\n<ul>\n<li class=\"title\">Guest Services<\/li>\n<li>Resturants and Cafes<\/li>\n<li>Hotels, Bnb's & Airbnb's<\/li>\n<\/ul>\n<\/div>\n<div class=\"list-2\">\n<ul>\n<li class=\"title\">Businesses<\/li>\n<li>Office Programs<\/li>\n<li>Service Centers<\/li>\n<\/ul>\n<\/div>\n<div class=\"list-3\">\n<ul>\n<li class=\"title\">Shops<\/li>\n<li>Specialty Retailers<\/li>\n<li>Grocery Stores<\/li>\n<\/ul>\n<\/div>\n<\/div>","color_scheme":"background-1","padding_top":40,"padding_bottom":52}},"main":{"type":"main-page","disabled":true,"settings":{"padding_top":36,"padding_bottom":36}},"7605e401-64a7-447b-945c-4a93b950bd75":{"type":"image-banner","blocks":{"template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-0":{"type":"heading","disabled":true,"settings":{"heading":"","heading_size":"h1"}},"template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-1":{"type":"text","disabled":true,"settings":{"text":"","text_style":"body"}},"template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-2":{"type":"buttons","disabled":true,"settings":{"button_label_1":"","button_link_1":"","button_style_secondary_1":false,"button_label_2":"","button_link_2":"","button_style_secondary_2":false}}},"block_order":["template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-0","template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-1","template--14646129262658__7605e401-64a7-447b-945c-4a93b950bd75-1685574534a39c0f3a-2"],"settings":{"image":"shopify:\/\/shop_images\/cafehover-min-scaled.jpg","image_overlay_opacity":0,"image_height":"medium","desktop_content_position":"middle-center","show_text_box":true,"desktop_content_alignment":"center","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"center","stack_images_on_mobile":true,"show_text_below":true}},"0b4e0496-a5b8-4076-87e8-80e242271750":{"type":"image-with-text","blocks":{"template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-0":{"type":"heading","settings":{"heading":"Restaurant & Cafe Programs","heading_size":"h1"}},"template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-1":{"type":"text","settings":{"text":"<p>When it comes to coffee we're your partner in success. From pairing coffee with you menu, to creating specialty drinks and custom blends, we do it all. Plus, plus we'll also help you save on your bottom line too with progressive discounts and staff training.<\/p>","text_style":"body"}},"template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-2":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-0","template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-1","template--14646129262658__0b4e0496-a5b8-4076-87e8-80e242271750-1685572633964b1b45-2"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}","img {height: auto; border: 30px solid #f6f6da;}",".button.button--primary {background-color: transparent; color: #bb7164; outline: 0; margin-left: auto; margin-right: auto;}",".button::after {background-color: transparent; color: #bb7164; border-radius: 25px; border: 1px solid;}"],"settings":{"image":"shopify:\/\/shop_images\/FUCR-DRN-20000101-5616-x-3744-31-1-min-1024x576.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"form":{"type":"contact-form","disabled":true,"settings":{"heading":"","heading_size":"h1","color_scheme":"background-1","padding_top":36,"padding_bottom":36}},"5d97acf6-eb4a-4a29-a17e-b1614ef0fb8a":{"type":"image-with-text","blocks":{"eff2a56e-4c57-40a6-bf58-0e755d0ee093":{"type":"heading","settings":{"heading":"Hotel, Bnb & Airbnb programs","heading_size":"h1"}},"ff317921-8a28-4174-a990-e03790a1ced6":{"type":"text","settings":{"text":"<p>We offer customized coffee programs to fit your needs. We know there’s nothing like the smell of freshly roasted coffee in the morning to show your guests you care, but we can make them feel even more at home!<\/p>","text_style":"body"}},"c03bb809-9bb0-480f-bddc-9038fb0ffad1":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["eff2a56e-4c57-40a6-bf58-0e755d0ee093","ff317921-8a28-4174-a990-e03790a1ced6","c03bb809-9bb0-480f-bddc-9038fb0ffad1"],"custom_css":["h2 {font-size: 2.5rem;}","img {height: auto; border: 30px solid #f6f6da;}"],"settings":{"image":"shopify:\/\/shop_images\/Farmers-Union-Wholesale-For-Restaurant-min.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"8e539032-9f66-4b01-9dbd-877f192fd948":{"type":"image-with-text","blocks":{"21916dd4-1ef2-49be-b480-1f17c7947f85":{"type":"heading","settings":{"heading":"office programs","heading_size":"h1"}},"7ff98351-1fe5-40ce-b042-b3c1753457d5":{"type":"text","settings":{"text":"<p>Coffee is the lifeblood of a productive office. And if you’re paying upwards of $2 a cup in your breakroom, you could be spending hundreds of dollars every month on mediocre coffee. With Farmers Union, you can brew better coffee at your office than you’ll ever find at Starbucks, and it costs just pennies per cup.<\/p>","text_style":"body"}},"1c446167-1a06-4dea-bf52-f8ced349012f":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["21916dd4-1ef2-49be-b480-1f17c7947f85","7ff98351-1fe5-40ce-b042-b3c1753457d5","1c446167-1a06-4dea-bf52-f8ced349012f"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}","img {height: auto; border: 30px solid #cad6d2;}",".button.button--primary {background-color: transparent; color: #bb7164; outline: 0; margin-left: auto; margin-right: auto;}",".button::after {background-color: transparent; color: #bb7164; border-radius: 25px; border: 1px solid;}"],"settings":{"image":"shopify:\/\/shop_images\/office-1-min-1024x683.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"ab6bd86f-dd1a-4b01-a11a-0149bc563896":{"type":"image-with-text","blocks":{"65fb99ce-e55f-47fe-881c-2ff375b08117":{"type":"heading","settings":{"heading":"Service Center Programs","heading_size":"h1"}},"5eb19271-ed67-4013-8294-30dcaa0a410c":{"type":"text","settings":{"text":"<p>Are you a car dealership, repair shop, or high traffic business that loves treating it’s customers to a cup of coffee while they wait? Treat them to the best coffee experience possible with Farmers Union coffee. Our programs are designed to elevate your coffee offering from basic to cafe standard, with fresh micro-lots and simple brewing solutions that make sense for high traffic establishments with minimal equipment.<\/p>","text_style":"body"}},"95c7b488-6420-4c89-ab88-18002927f15e":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["65fb99ce-e55f-47fe-881c-2ff375b08117","5eb19271-ed67-4013-8294-30dcaa0a410c","95c7b488-6420-4c89-ab88-18002927f15e"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}","img {height: auto; border: 30px solid #cad6d2;}",".button.button--primary {background-color: transparent; color: #bb7164; outline: 0; margin-left: auto; margin-right: auto;}",".button::after {background-color: transparent; color: #bb7164; border-radius: 25px; border: 1px solid;}"],"settings":{"image":"shopify:\/\/shop_images\/Farmers-Union-Wholesale-For-Statups-min.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"ab4becb8-a343-409e-857c-2b9c4c214ef0":{"type":"image-with-text","blocks":{"99af47a9-ed47-4eb5-a203-56082dc2fbb3":{"type":"heading","settings":{"heading":"Specialty Retailers","heading_size":"h1"}},"de69c57b-03b1-4407-a081-4183e176a2b8":{"type":"text","settings":{"text":"<p>Are you a boutique store looking to give your customers the gift of local? Coffee is one of the most emerging trends on the shelf, and our wholesale programs make it easy for you to get started. We’re here to help you make a difference in your community and provide an incredible <br\/>experience for your customers. We have a variety of options available, so whether you’re just starting out or already have an established coffee offering, we have something for you.<\/p>","text_style":"body"}},"f52bd780-9f59-4f4f-97ef-82a6d067cf2c":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["99af47a9-ed47-4eb5-a203-56082dc2fbb3","de69c57b-03b1-4407-a081-4183e176a2b8","f52bd780-9f59-4f4f-97ef-82a6d067cf2c"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}","img {height: auto; border: 30px solid #eee0d5;}",".button.button--primary {background-color: transparent; color: #bb7164; outline: 0; margin-left: auto; margin-right: auto;}",".button::after {background-color: transparent; color: #bb7164; border-radius: 25px; border: 1px solid;}"],"settings":{"image":"shopify:\/\/shop_images\/specialty-1-min-1024x683.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"8dc61a26-8e0b-4187-9284-3c8b92a9d6c7":{"type":"image-with-text","blocks":{"4aa0f8d3-4460-45cb-ad2d-18db2b72db8b":{"type":"heading","settings":{"heading":"Grocery Stores","heading_size":"h1"}},"b268399a-4d28-42f7-ac5d-9da454d67921":{"type":"text","settings":{"text":"<p>It’s no secret that coffee goes stale after only a few weeks, and your customers are going to notice if they get a cup of coffee that’s old and stale. Farmers Union will come replace any bag of coffee that hasn’t <br\/>sold after 4 weeks – at no cost to you. You’ll never have to worry about stale coffee in your inventory again! We know how important it is to make sure your customers are getting the best product possible, so we <br\/>offer this service as a way for us to show you how much we care about our partnership with you.<\/p>","text_style":"body"}},"db2b9c3a-5c11-4460-84c9-01d0605dad44":{"type":"button","settings":{"button_label":"More Info","button_link":""}}},"block_order":["4aa0f8d3-4460-45cb-ad2d-18db2b72db8b","b268399a-4d28-42f7-ac5d-9da454d67921","db2b9c3a-5c11-4460-84c9-01d0605dad44"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}","img {height: auto; border: 30px solid #eee0d5;}",".button.button--primary {background-color: transparent; color: #bb7164; outline: 0; margin-left: auto; margin-right: auto;}",".button::after {background-color: transparent; color: #bb7164; border-radius: 25px; border: 1px solid; margin: auto;}"],"settings":{"image":"shopify:\/\/shop_images\/grocery-1-min-1024x668.jpg","height":"adapt","desktop_image_width":"medium","layout":"text_first","desktop_content_position":"top","desktop_content_alignment":"left","content_layout":"no-overlap","color_scheme":"background-1","image_behavior":"none","mobile_content_alignment":"left","padding_top":36,"padding_bottom":36}},"2258ce2d-fb18-4285-b700-4d406b59e80d":{"type":"custom-liquid","custom_css":["h2 {text-align: center; color: #11414d;}","p {margin: 0 10%;}"],"settings":{"custom_liquid":"<h2>Do you have any questions?<\/h2>\n<p>We get asked a lot of the same questions about our coffee, so we thought we’d put together a list of some of the most common ones. If you have any other questions that aren’t answered here, please get in touch!<\/p>","color_scheme":"background-1","padding_top":40,"padding_bottom":0}},"83af2b07-38a0-48ee-bfed-9b50b2494a03":{"type":"collapsible-content","blocks":{"template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-0":{"type":"collapsible_row","settings":{"heading":"Where do you roast your coffee?","icon":"none","row_content":"<p>Our roasting facility is located in Eugene, Oregon.<\/p>","page":""}},"template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-1":{"type":"collapsible_row","settings":{"heading":"When do you roast?","icon":"none","row_content":"<p>We roast coffee weekly and will go to great lengths to only ship you <br\/>coffee that’s been roasted less than 7 days prior to your order. Why? <br\/>Because after only three weeks on shelves, more than 90% of those flavor compounds have disappeared. And that’s a shame, because coffee is all about the flavor. That’s why we want you to enjoy the freshest <br\/>possible beans every time you brew up a pot.<\/p>","page":""}},"template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-2":{"type":"collapsible_row","settings":{"heading":"How do your wholesale programs work?","icon":"none","row_content":"<p>We’re excited to work with you on creating a coffee program that makes your business memorable.<\/p><p>Here’s how it works:<\/p><p>We’ll meet to talk about your goals, values and what we can achieve together.<br\/>Then we’ll decide which coffees we might serve throughout the year and <br\/>plan any specialty drinks that might be right for your business. <br\/>Finally, we’ll track how much coffee you use and restock anything you’re<br\/> running low on so you’re always serving the freshest possible brews!<\/p>","page":""}},"template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-3":{"type":"collapsible_row","settings":{"heading":"Why Farmers union?","icon":"none","row_content":"<p>We’re not just a coffee shop. Or a coffee roaster. We’re your neighbors,<br\/> We’re a place to come together, build community and inspire each other.<br\/> We believe that good coffee impacts so much and so many.<br\/><br\/>We believe good coffee changes everything. It changes you, the person drinking it. Because finding the right beans, developing the skill and appreciation to brew them just right, makes you a happier person. And we believe that when you’re genuinely happy, you can do amazing things. Good coffee changes farmers. It’s true! When you think about it, harvesting the finest coffee doesn’t just happen—it takes great care and ingenuity from entire families and communities for generations. We think that’s pretty cool. And we want to support them to live out their passion. We think coffee roasting is a meticulous art that brings people joy, and our job is to make you proud to call Eugene ho<\/p>","page":""}}},"block_order":["template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-0","template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-1","template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-2","template--14646129262658__83af2b07-38a0-48ee-bfed-9b50b2494a03-1685572753c5e8552f-3"],"custom_css":["h2 {font-size: 2.5rem; font-family: \"ancho\"; color: #11414d;}",".accordion__title.inline-richtext.h4 {font-family: \"ancho\"; color: #11414d; font-weight: 200;}"],"settings":{"caption":"","heading":"","heading_size":"h1","heading_alignment":"center","layout":"none","color_scheme":"background-1","container_color_scheme":"background-2","open_first_collapsible_row":false,"image_ratio":"adapt","desktop_layout":"image_second","padding_top":36,"padding_bottom":36}},"2a202eef-4aba-4677-be58-d63944c08135":{"type":"slideshow","disabled":true,"blocks":{"template--14646129262658__2a202eef-4aba-4677-be58-d63944c08135-168557284114550fd2-0":{"type":"slide","settings":{"image":"shopify:\/\/shop_images\/logo-1-min1-9.jpg","heading":"","heading_size":"h1","subheading":"","button_label":"","link":"","button_style_secondary":false,"box_align":"middle-left","show_text_box":true,"text_alignment":"right","image_overlay_opacity":0,"color_scheme":"background-1","text_alignment_mobile":"center"}},"template--14646129262658__2a202eef-4aba-4677-be58-d63944c08135-168557284114550fd2-1":{"type":"slide","settings":{"image":"shopify:\/\/shop_images\/logo-1-min1-8.jpg","heading":"Image slide","heading_size":"h1","subheading":"Tell your brand's story through images","button_label":"Button label","link":"","button_style_secondary":false,"box_align":"middle-center","show_text_box":true,"text_alignment":"center","image_overlay_opacity":0,"color_scheme":"background-1","text_alignment_mobile":"center"}},"4489def9-f155-41fb-ae2d-e0d034beb2c6":{"type":"slide","settings":{"heading":"Image slide","heading_size":"h1","subheading":"Tell your brand's story through images","button_label":"Button label","link":"","button_style_secondary":false,"box_align":"middle-center","show_text_box":true,"text_alignment":"center","image_overlay_opacity":0,"color_scheme":"background-1","text_alignment_mobile":"center"}}},"block_order":["template--14646129262658__2a202eef-4aba-4677-be58-d63944c08135-168557284114550fd2-0","template--14646129262658__2a202eef-4aba-4677-be58-d63944c08135-168557284114550fd2-1","4489def9-f155-41fb-ae2d-e0d034beb2c6"],"settings":{"layout":"grid","slide_height":"small","slider_visual":"counter","auto_rotate":false,"change_slides_speed":5,"image_behavior":"none","show_text_below":true,"accessibility_info":"Slideshow about our brand"}},"c5bb484e-2505-4ccc-87d2-03fac2fc426f":{"type":"custom-liquid","custom_css":["* {background-color: white;}",".img-container {display: flex; justify-content: center; align-content: space-between; flex-wrap: wrap; flex-direction: row; max-width: 80vw; margin: 10px 10%;}","img {max-width: 150px; height: auto; padding: 20px; object-fit: contain;}",".txt-box {display: flex; padding: 20px 10%;}","h2 {color: #11414d;}"],"settings":{"custom_liquid":"<div class=\"txt-box\">\n<h2>Wholesale Partners<\/h2>\n<p>Here are some of our current wholesale partners who use Farmers Union coffee. We’re so delighted to be able to help these companies serve their customers the best cups of coffee they can get!<\/p>\n<\/div>\n<div class=\"img-container\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-8.jpg?v=1685572992\" alt=\"Mac Logo\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-5.jpg?v=1685572992\" alt=\"Lox,Stocks and Bagels\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-6.jpg?v=1685572991\n\" alt=\"Better Living Room\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-2.jpg?v=1685572992\n\" alt=\"Kells Coffee\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-3.jpg?v=1685572991\n\" alt=\"\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-10.jpg?v=1685572991\n\" alt=\"\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-11.jpg?v=1685572991\n\" alt=\"Claim 52\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-7.jpg?v=1685572991\n\" alt=\"Friendly St Market\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-9.jpg?v=1685572992\n\" alt=\"\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-1.jpg?v=1685572992\n\" alt=\"Dahshire Brewing\">\n<img src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/logo-1-min1-4.jpg?v=1685572992\n\" alt=\"Creswell Bakery\">\n<\/div>","color_scheme":"background-1","padding_top":28,"padding_bottom":32}},"d5a3572a-e3d7-4a10-b742-89073b0dd065":{"type":"custom-liquid","custom_css":["* {background-image: url(https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/farmers-union-pattern-3.svg); background-color: #f2e9e0; background-size: auto;}",".learn-about-box {display: flex; justify-content: space-evenly; align-items: center;}",".arrows {display: inline-block; height: 50px;}",".arrow-links a {display: inline-block; font-size: 2rem; font-family: \"Ancho\"; color: #11414d; text-decoration: none;}","h2 {font-size: 3rem; color: #11414d;}"],"settings":{"custom_liquid":"<div class=\"learn-about-box\">\n<h2 class=\"vert-text\">Learn about coffee<\/h2>\n<div class=\"arrow-links\">\n<a href=\"url\">Origin Stories<\/a><img class=\"arrows\" src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/Arrow-Right-Toward.svg?v=1685142664\">\n<\/div>\n<div class=\"arrow-links\">\n<a href=\"url\">Brewing Recipes<\/a><img class=\"arrows\" src=\"https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/Arrow-Right-Toward.svg?v=1685142664\">\n<\/div>\n<\/div>","color_scheme":"background-1","padding_top":8,"padding_bottom":0}},"4c636565-866f-4623-a4ca-782c0bdb0f21":{"type":"multicolumn","blocks":{"template--14646129262658__4c636565-866f-4623-a4ca-782c0bdb0f21-1685663050d64602bc-1":{"type":"column","settings":{"image":"shopify:\/\/shop_images\/mexico-landscape.jpg","title":"Oaxacan Coffee Origin","text":"<p>One of the key factors that makes the coffee from Oaxaca unique is the <br\/>region’s terroir. Oaxaca is located in the southern part of Mexico,<\/p>","link_label":"Read More","link":""}},"template--14646129262658__4c636565-866f-4623-a4ca-782c0bdb0f21-1685663050d64602bc-2":{"type":"column","settings":{"image":"shopify:\/\/shop_images\/Coffee-Sorting-2.webp","title":"Ethiopia and the Yirgacheffe growing region","text":"<p>Ethiopia is known for its rich coffee growing tradition and is often <br\/>considered the birthplace of coffee. The country is home to a diverse <br\/>array<\/p>","link_label":"Learn More","link":""}}},"block_order":["template--14646129262658__4c636565-866f-4623-a4ca-782c0bdb0f21-1685663050d64602bc-1","template--14646129262658__4c636565-866f-4623-a4ca-782c0bdb0f21-1685663050d64602bc-2"],"custom_css":[".multicolumn-card.content-container,.multicolumn-card__info {background-color: #cad6d2;}",".title.inline-richtext.h1 {width: 200px;}",".multicolumn.color-background-1.gradient.background-primary.no-heading {background-color: #f2e9e0; background-image: url(https:\/\/cdn.shopify.com\/s\/files\/1\/0068\/0941\/9840\/files\/farmers-union-pattern-3.svg?v=1685146460); background-attachment: initial;}"],"settings":{"title":"","heading_size":"h1","image_width":"full","image_ratio":"adapt","columns_desktop":3,"column_alignment":"left","background_style":"primary","button_label":"","button_link":"","color_scheme":"background-1","columns_mobile":"1","swipe_on_mobile":false,"padding_top":36,"padding_bottom":36}}},"order":["6d46c1b3-2294-4b73-a95d-d8794f3299ab","5dc1ef4e-5388-4985-994e-3cc53bd054c0","main","7605e401-64a7-447b-945c-4a93b950bd75","0b4e0496-a5b8-4076-87e8-80e242271750","form","5d97acf6-eb4a-4a29-a17e-b1614ef0fb8a","8e539032-9f66-4b01-9dbd-877f192fd948","ab6bd86f-dd1a-4b01-a11a-0149bc563896","ab4becb8-a343-409e-857c-2b9c4c214ef0","8dc61a26-8e0b-4187-9284-3c8b92a9d6c7","2258ce2d-fb18-4285-b700-4d406b59e80d","83af2b07-38a0-48ee-bfed-9b50b2494a03","2a202eef-4aba-4677-be58-d63944c08135","c5bb484e-2505-4ccc-87d2-03fac2fc426f","d5a3572a-e3d7-4a10-b742-89073b0dd065","4c636565-866f-4623-a4ca-782c0bdb0f21"]}
-=======
-{
-  "sections": {
-    "main": {
-      "type": "main-page",
-      "settings": {
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "form": {
-      "type": "contact-form",
-      "settings": {
-        "heading": "",
-        "heading_size": "h1",
-        "color_scheme": "scheme-1",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    }
-  },
-  "order": [
-    "main",
-    "form"
-  ]
-}
->>>>>>> v15.2.0
diff --git a/templates/password.json b/templates/password.json
index 70f0fda506e..a0144b64ebd 100644
--- a/templates/password.json
+++ b/templates/password.json
@@ -1,50 +1 @@
-<<<<<<< HEAD
 {"layout":"password","sections":{"main":{"type":"email-signup-banner","blocks":{"heading":{"type":"heading","settings":{"heading":"Opening soon","heading_size":"h1"}},"paragraph":{"type":"paragraph","settings":{"text":"<p>Be the first to know when we launch.<\/p>","text_style":"body"}},"email_form":{"type":"email_form","settings":{}}},"block_order":["heading","paragraph","email_form"],"settings":{"image_overlay_opacity":0,"show_background_image":true,"image_height":"medium","desktop_content_position":"middle-center","show_text_box":true,"desktop_content_alignment":"center","color_scheme":"background-1","mobile_content_alignment":"center","show_text_below":true}}},"order":["main"]}
-=======
-{
-  "layout": "password",
-  "sections": {
-    "main": {
-      "type": "email-signup-banner",
-      "blocks": {
-        "heading": {
-          "type": "heading",
-          "settings": {
-            "heading": "Opening soon",
-            "heading_size": "h1"
-          }
-        },
-        "paragraph": {
-          "type": "paragraph",
-          "settings": {
-            "text": "<p>Be the first to know when we launch.<\/p>",
-            "text_style": "body"
-          }
-        },
-        "email_form": {
-          "type": "email_form"
-        }
-      },
-      "block_order": [
-        "heading",
-        "paragraph",
-        "email_form"
-      ],
-      "settings": {
-        "image_overlay_opacity": 0,
-        "show_background_image": true,
-        "image_height": "medium",
-        "desktop_content_position": "middle-center",
-        "show_text_box": true,
-        "desktop_content_alignment": "center",
-        "color_scheme": "scheme-1",
-        "mobile_content_alignment": "center",
-        "show_text_below": true
-      }
-    }
-  },
-  "order": [
-    "main"
-  ]
-}
->>>>>>> v15.2.0
diff --git a/templates/product.json b/templates/product.json
index 6dcbe4e2537..97be6595762 100644
--- a/templates/product.json
+++ b/templates/product.json
@@ -1,220 +1 @@
-<<<<<<< HEAD
 {"sections":{"main":{"type":"main-product","blocks":{"vendor":{"type":"text","settings":{"text":"{{ product.vendor }}","text_style":"uppercase"}},"title":{"type":"title","settings":{}},"price":{"type":"price","settings":{}},"variant_picker":{"type":"variant_picker","settings":{"picker_type":"button"}},"f233889e-1d52-4834-b71f-79e7b9032e48":{"type":"shopify:\/\/apps\/paywhirl\/blocks\/paywhirl-plan-selector\/41e95d60-82cf-46e8-84de-618d7e4c37b7","settings":{"font_scale":100,"theme":"default","selling_plans_first":false,"theme_color":"#334fb4","product":"{{product}}"}},"quantity_selector":{"type":"quantity_selector","settings":{}},"buy_buttons":{"type":"buy_buttons","settings":{"show_dynamic_checkout":true,"show_gift_card_recipient":false}},"description":{"type":"description","settings":{}},"share":{"type":"share","settings":{"share_label":"Share"}}},"block_order":["vendor","title","price","variant_picker","f233889e-1d52-4834-b71f-79e7b9032e48","quantity_selector","buy_buttons","description","share"],"settings":{"enable_sticky_info":true,"media_size":"large","constrain_to_viewport":true,"media_fit":"contain","gallery_layout":"stacked","media_position":"left","image_zoom":"lightbox","mobile_thumbnails":"hide","hide_variants":true,"enable_video_looping":false,"padding_top":36,"padding_bottom":12}},"168754160602162f09":{"type":"apps","blocks":{"b4b3f41f-77e5-4ce4-b18b-53f174ed84ff":{"type":"shopify:\/\/apps\/judge-me-product-reviews\/blocks\/review_widget\/61ccd3b1-a9f2-4160-9fe9-4fec8413e5d8","settings":{}}},"block_order":["b4b3f41f-77e5-4ce4-b18b-53f174ed84ff"],"settings":{"include_margins":true}},"related-products":{"type":"related-products","settings":{"heading":"You may also like","heading_size":"h2","products_to_show":4,"columns_desktop":4,"color_scheme":"background-1","image_ratio":"square","image_shape":"default","show_secondary_image":true,"show_vendor":false,"show_rating":false,"columns_mobile":"2","padding_top":36,"padding_bottom":28}}},"order":["main","168754160602162f09","related-products"]}
-=======
-{
-  "sections": {
-    "main": {
-      "type": "main-product",
-      "blocks": {
-        "vendor": {
-          "type": "text",
-          "settings": {
-            "text": "{{ product.vendor }}",
-            "text_style": "uppercase"
-          }
-        },
-        "title": {
-          "type": "title"
-        },
-        "caption": {
-          "type": "text",
-          "settings": {
-            "text": "{{ product.metafields.descriptors.subtitle.value }}",
-            "text_style": "subtitle"
-          }
-        },
-        "price": {
-          "type": "price"
-        },
-        "variant_picker": {
-          "type": "variant_picker",
-          "settings": {
-            "picker_type": "button"
-          }
-        },
-        "quantity_selector": {
-          "type": "quantity_selector"
-        },
-        "buy_buttons": {
-          "type": "buy_buttons",
-          "settings": {
-            "show_dynamic_checkout": true,
-            "show_gift_card_recipient": true
-          }
-        },
-        "description": {
-          "type": "description"
-        },
-        "collapsible-row-0": {
-          "type": "collapsible_tab",
-          "settings": {
-            "heading": "Materials",
-            "icon": "leather",
-            "content": "",
-            "page": ""
-          }
-        },
-        "collapsible-row-1": {
-          "type": "collapsible_tab",
-          "settings": {
-            "heading": "Shipping & Returns",
-            "icon": "truck",
-            "content": "",
-            "page": ""
-          }
-        },
-        "collapsible-row-2": {
-          "type": "collapsible_tab",
-          "settings": {
-            "heading": "Dimensions",
-            "icon": "ruler",
-            "content": "",
-            "page": ""
-          }
-        },
-        "collapsible-row-3": {
-          "type": "collapsible_tab",
-          "settings": {
-            "heading": "Care Instructions",
-            "icon": "heart",
-            "content": "",
-            "page": ""
-          }
-        },
-        "share": {
-          "type": "share",
-          "settings": {
-            "share_label": "Share"
-          }
-        }
-      },
-      "block_order": [
-        "vendor",
-        "title",
-        "caption",
-        "price",
-        "variant_picker",
-        "quantity_selector",
-        "buy_buttons",
-        "description",
-        "collapsible-row-0",
-        "collapsible-row-1",
-        "collapsible-row-2",
-        "collapsible-row-3",
-        "share"
-      ],
-      "settings": {
-        "enable_sticky_info": true,
-        "gallery_layout": "stacked",
-        "media_size": "large",
-        "constrain_to_viewport": true,
-        "mobile_thumbnails": "hide",
-        "hide_variants": true,
-        "enable_video_looping": false,
-        "padding_top": 36,
-        "padding_bottom": 12
-      }
-    },
-    "image-with-text": {
-      "type": "image-with-text",
-      "blocks": {
-        "image-with-text-0": {
-          "type": "heading",
-          "settings": {
-            "heading": "Image with text",
-            "heading_size": "h1"
-          }
-        },
-        "image-with-text-1": {
-          "type": "text",
-          "settings": {
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "text_style": "body"
-          }
-        }
-      },
-      "block_order": [
-        "image-with-text-0",
-        "image-with-text-1"
-      ],
-      "settings": {
-        "height": "small",
-        "desktop_image_width": "medium",
-        "layout": "text_first",
-        "desktop_content_position": "top",
-        "desktop_content_alignment": "left",
-        "content_layout": "no-overlap",
-        "color_scheme": "scheme-2",
-        "mobile_content_alignment": "left",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "multicolumn": {
-      "type": "multicolumn",
-      "blocks": {
-        "column-0": {
-          "type": "column",
-          "settings": {
-            "title": "Free Shipping",
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "link_label": "",
-            "link": ""
-          }
-        },
-        "column-1": {
-          "type": "column",
-          "settings": {
-            "title": "Hassle-Free Exchanges",
-            "text": "<p>Pair text with an image to focus on your chosen product, collection, or blog post. Add details on availability, style, or even provide a review.<\/p>",
-            "link_label": "",
-            "link": ""
-          }
-        }
-      },
-      "block_order": [
-        "column-0",
-        "column-1"
-      ],
-      "settings": {
-        "title": "",
-        "heading_size": "h1",
-        "image_width": "full",
-        "image_ratio": "adapt",
-        "columns_desktop": 2,
-        "column_alignment": "left",
-        "background_style": "none",
-        "button_label": "",
-        "button_link": "",
-        "swipe_on_mobile": false,
-        "color_scheme": "scheme-1",
-        "columns_mobile": "1",
-        "padding_top": 36,
-        "padding_bottom": 36
-      }
-    },
-    "related-products": {
-      "type": "related-products",
-      "settings": {
-        "heading": "You may also like",
-        "heading_size": "h2",
-        "columns_desktop": 4,
-        "color_scheme": "scheme-1",
-        "image_ratio": "square",
-        "show_secondary_image": true,
-        "show_vendor": false,
-        "show_rating": false,
-        "columns_mobile": "2",
-        "padding_top": 36,
-        "padding_bottom": 28
-      }
-    }
-  },
-  "order": [
-    "main",
-    "image-with-text",
-    "multicolumn",
-    "related-products"
-  ]
-}
->>>>>>> v15.2.0