From 2180951b815ae09918f22d0908ed427b16d704b6 Mon Sep 17 00:00:00 2001
From: CarlNation <Carl.Nation@safelite.com>
Date: Wed, 20 Aug 2025 06:42:16 -0400
Subject: [PATCH] fix merge conflict issue from last week

---
 src/layouts/estimate/estimate.vue | 4 ++--
 src/styles/ux-variables.scss      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index ff58adf83..3959dfef3 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -266,13 +266,13 @@ export default {
 <style lang="scss" scoped>
 .header-copy {
     font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
-<style lang="scss">
+}
 .vinlookupquestion p {
     font-size: 1.25rem;
 }
 .header-sub-copy {
     font-size: 0.875rem;
-
+}
 .select-an-option {
     font-family: UrbanistSemibold;
     font-weight: 600;
diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss
index bec02081f..c0a69a112 100644
--- a/src/styles/ux-variables.scss
+++ b/src/styles/ux-variables.scss
@@ -123,8 +123,8 @@ $body-color: $gray-600;
 
 //Fonts
 $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
-$font-family-monospace:
-    UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New",
+    monospace;
 // stylelint-enable value-keyword-case
 $font-family-base: $font-family-sans-serif;
 $font-family-code: $font-family-monospace;