From 0c72dfb7452e283f353874f7484472c87aa8fc45 Mon Sep 17 00:00:00 2001
From: Rafee <rafee.rahman@hotmail.com>
Date: Tue, 28 Nov 2023 12:43:23 -0500
Subject: [PATCH] Resolve merge conflict

---
 emails/templates/emails/first_time_user.html   | 2 +-
 emails/tests/mgmt_send_welcome_emails_tests.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emails/templates/emails/first_time_user.html b/emails/templates/emails/first_time_user.html
index 501ad50252..d40f3ba76a 100644
--- a/emails/templates/emails/first_time_user.html
+++ b/emails/templates/emails/first_time_user.html
@@ -253,7 +253,7 @@ <h1 class="hero-title" style="margin: 0px; color: #ffffff; line-height: 100%; te
                   <p style="color: #321C64; font-size: 18px; font-family: metropolis medium, system-ui, sans-serif;">{% ftlmsg 'first-time-user-email-hero-primary-text' %}</p> 
                   <p style="color: #321C64; font-size: 18px; font-family: metropolis medium, system-ui, sans-serif;margin-top: 20px;">{% ftlmsg 'first-time-user-email-hero-secondary-text' %}</p>
 
-                  <a href="{{ SITE_ORIGIN }}/accounts/profile/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=hero-cta" target="_blank" class="button" style="margin-top: 30px; color: #FFFFFF;" rel="noreferrer">{% ftlmsg 'first-time-user-email-hero-cta' %}</a>
+                  <a href="{{ SITE_ORIGIN }}/accounts/profile/?utm_campaign=relay-onboarding&utm_source=relay-onboarding&utm_medium=email&utm_content=hero-cta" target="_blank" class="button" style="margin-top: 30px; color: #FFFFFF;" rel="noreferrer">{% ftlmsg 'first-time-user-email-cta-dashboard-button' %}</a>
 
                 </td>
               </tr>
diff --git a/emails/tests/mgmt_send_welcome_emails_tests.py b/emails/tests/mgmt_send_welcome_emails_tests.py
index 9e2c4429a6..e677851a79 100644
--- a/emails/tests/mgmt_send_welcome_emails_tests.py
+++ b/emails/tests/mgmt_send_welcome_emails_tests.py
@@ -71,7 +71,7 @@ def test_send_welcome_emails(
     assert source == settings.RELAY_FROM_ADDRESS
     with django_ftl.override(user.profile.language):
         expected_subject = ftl_bundle.format("first-time-user-email-welcome")
-        expected_cta = ftl_bundle.format("first-time-user-email-hero-cta")
+        expected_cta = ftl_bundle.format("first-time-user-email-cta-dashboard-button")
     assert subject == expected_subject
     assert expected_cta in body_html