From b3166d9de1f17f12363b31781fd9fd8ae4377aac Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 3 Jun 2024 12:58:56 -0600
Subject: [PATCH] Merge conflict

---
 src/registrar/templates/includes/profile_form.html |  2 +-
 src/registrar/templates/profile.html               | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/includes/profile_form.html b/src/registrar/templates/includes/profile_form.html
index 018291092..d229801f3 100644
--- a/src/registrar/templates/includes/profile_form.html
+++ b/src/registrar/templates/includes/profile_form.html
@@ -6,7 +6,7 @@
 {% endblock profile_header %}
 
 {% block profile_blurb %}
-<p>We <a href="{% public_site_url 'domains/requirements/#keep-your-contact-information-updated' %}" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
+<p>We <a class="usa-link" href="{% public_site_url 'domains/requirements/#keep-your-contact-information-updated' %}" target="_blank">require</a> that you maintain accurate contact information. The details you provide will only be used to support the administration of .gov and won’t be made public.</p>
 
 <h2>Contact information</h2>
 <p>Review the details below and update any required information. Note that editing this information won’t affect your Login.gov account information.</p>
diff --git a/src/registrar/templates/profile.html b/src/registrar/templates/profile.html
index 12441da66..c126204bd 100644
--- a/src/registrar/templates/profile.html
+++ b/src/registrar/templates/profile.html
@@ -20,16 +20,22 @@ Edit your User Profile |
     {% include "includes/form_errors.html" with form=form %}
 
     {% if show_back_button %}
-      <a href="{% url 'home' %}" class="breadcrumb__back">
+      <a href="{% if not return_to_request %}{% url 'home' %}{% else %}{% url 'domain-request:' %}{% endif %}" class="breadcrumb__back">
         <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
         <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
         </svg>
-    
+        {% if not return_to_request %}
         <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
           {{ profile_back_button_text }}
         </p>
+        {% else %}
+        <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
+          Go back to your domain request
+        </p>
+        {% endif %}
       </a>
     {% endif %}
+
 {% endblock content %}
 
 {% block content_bottom %}