From 8fe142111a8e62936ee856055ab2b5daf0e39a71 Mon Sep 17 00:00:00 2001
From: Bryann Valderrama <bryann.valderrama@edunext.co>
Date: Tue, 14 Jan 2025 10:11:25 -0500
Subject: [PATCH] fix: resolve conflicts

---
 .../concepts/exercise_tools/OpenResponseAssessments.rst    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/source/educators/concepts/exercise_tools/OpenResponseAssessments.rst b/source/educators/concepts/exercise_tools/OpenResponseAssessments.rst
index 1a77ec46b..a2dbcf4ec 100644
--- a/source/educators/concepts/exercise_tools/OpenResponseAssessments.rst
+++ b/source/educators/concepts/exercise_tools/OpenResponseAssessments.rst
@@ -17,11 +17,8 @@ assessment) to complete the assignment.
    an open response assessment divided by cohort, you must create that
    assessment in a course component that is defined as cohort-specific. For  more
    information about cohorts and creating cohort-specific course content, see
-<<<<<<< HEAD
-   :ref:`Cohorts Overview <cohorts overview>` and :ref:`Offering Differentiated Content to Different Learner Groups <Offering Differentiated Content>`.
-=======
-   :ref:`Cohorts Overview <cohorts overview>` and :ref:`Create Cohort Specific Course Content`.
->>>>>>> 637ea0a (docs: update refs of 'OpenResponseAssessments.rst' file)
+   :ref:`Cohorts Overview <cohorts overview>` and :ref:`Offering Differentiated
+   Content`.
 
 The following topics provide conceptual information about open response
 assessments.