diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html
index a45f6a93cb..17c3357861 100644
--- a/lms/templates/courseware/course_about.html
+++ b/lms/templates/courseware/course_about.html
@@ -88,7 +88,7 @@
                     <a href="${course_target}">
                 %endif
 
-                <span class="register disabled">${_("You are registered for this course {course.display_number_with_default}").
+                <span class="register disabled">${_("You are registered for this course {course.display_number_with_default}").format(course=course) | h}</span>
                 %if show_courseware_link:
                     <strong>${_("View Courseware")}</strong>
                     </a>
diff --git a/lms/templates/courseware/courseware.html b/lms/templates/courseware/courseware.html
index cc5646b3a4..2a52b50b09 100644
--- a/lms/templates/courseware/courseware.html
+++ b/lms/templates/courseware/courseware.html
@@ -2,11 +2,7 @@
 <%inherit file="/main.html" />
 <%namespace name='static' file='/static_content.html'/>
 <%block name="bodyclass">courseware ${course.css_class}</%block>
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Courseware</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%block name="headextra">
   <%static:css group='course'/>
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html
index 67bef227fa..0a520e0a1e 100644
--- a/lms/templates/courseware/info.html
+++ b/lms/templates/courseware/info.html
@@ -7,12 +7,7 @@
   <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course.number} Course Info").format(course=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Course Info</title></%block>
->>>>>>> add escaping
-
+<%block name="title"><title>${_("{course.number} Course Info").format(course=course.display_number_with_default) | h}</title></%block>
 <%include file="/courseware/course_navigation.html" args="active_page='info'" />
 <%!
   from courseware.courses import get_course_info_section
diff --git a/lms/templates/courseware/mktg_course_about.html b/lms/templates/courseware/mktg_course_about.html
index 71be39bc20..be623b5baa 100644
--- a/lms/templates/courseware/mktg_course_about.html
+++ b/lms/templates/courseware/mktg_course_about.html
@@ -8,11 +8,7 @@
 
 <%inherit file="../mktg_iframe.html" />
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>About ${course.display_number_with_default | h}</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%block name="bodyclass">view-partial-mktgregister</%block>
 
@@ -56,11 +52,7 @@
             <div class="action is-registered">${_("You Are Registered")}</div>
           %endif
         %elif allow_registration:
-<<<<<<< HEAD
-          <a class="action action-register register" href="#">${_("Register for")} <strong>${course.display_number_with_default}</strong></a>
-=======
-          <a class="action action-register register" href="#">Register for <strong>${course.display_number_with_default | h}</strong></a>
->>>>>>> add escaping
+          <a class="action action-register register" href="#">${_("Register for")} <strong>${course.display_number_with_default | h}</strong></a>
         %else:
           <div class="action registration-closed is-disabled">${_("Registration Is Closed")}</div>
         %endif
diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html
index 85f96bfbd5..324eadf560 100644
--- a/lms/templates/courseware/progress.html
+++ b/lms/templates/courseware/progress.html
@@ -8,11 +8,7 @@
 
 <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Progress</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse
diff --git a/lms/templates/courseware/syllabus.html b/lms/templates/courseware/syllabus.html
index 49c76f13ac..e2f3c53739 100644
--- a/lms/templates/courseware/syllabus.html
+++ b/lms/templates/courseware/syllabus.html
@@ -6,11 +6,7 @@
   <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Course Info</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course) | h}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
 <%!
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html
index 01d23e7e5d..1dfa66461c 100644
--- a/lms/templates/dashboard.html
+++ b/lms/templates/dashboard.html
@@ -140,27 +140,11 @@
 
           % if course.id in show_courseware_links_for:
             <a href="${course_target}" class="cover">
-<<<<<<< HEAD
-<<<<<<< HEAD
-              <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
+              <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}') |h}" />
             </a>
           % else:
             <div class="cover">
               <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
-=======
-              <img src="${course_image_url(course)}" alt="${course.display_number_with_default} ${course.display_name_with_default} Cover Image" />
-            </a>
-          % else:
-            <div class="cover">
-              <img src="${course_image_url(course)}" alt="${course.display_number_with_default} ${course.display_name_with_default} Cover Image" />
->>>>>>> add display_coursenumber and display_organization fields on the CourseModule, with some property accessors. Update LMS/CMS pages to use those display strings as appropraite.
-=======
-              <img src="${course_image_url(course)}" alt="${course.display_number_with_default | h} ${course.display_name_with_default} Cover Image" />
-            </a>
-          % else:
-            <div class="cover">
-              <img src="${course_image_url(course)}" alt="${course.display_number_with_default | h} ${course.display_name_with_default} Cover Image" />
->>>>>>> add escaping
             </div>
           % endif
 
@@ -213,23 +197,15 @@
                     % endif
                     % if  registration.is_rejected:
                 <div class="message message-status is-shown exam-schedule">
-<<<<<<< HEAD
-<<<<<<< HEAD
                   <p class="message-copy">
                     <strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format(
                       link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
                       link_end='</a>')}</strong>
                     ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format(
-                      link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.number),
+                      link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.display_number_with_default),
                       link_end='</a>',
                       email="exam-help@edx.org",
                      )}
-=======
-                  <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.display_number_with_default}">contact edX at exam-help@edx.org</a> for further help.</p>
->>>>>>> add display_coursenumber and display_organization fields on the CourseModule, with some property accessors. Update LMS/CMS pages to use those display strings as appropraite.
-=======
-                  <p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.display_number_with_default | h}">contact edX at exam-help@edx.org</a> for further help.</p>
->>>>>>> add escaping
                 </div>
                     % endif
                    	% if not registration.is_accepted and not registration.is_rejected:
diff --git a/lms/templates/open_ended_problems/combined_notifications.html b/lms/templates/open_ended_problems/combined_notifications.html
index 1b8898fedc..ce22a5c580 100644
--- a/lms/templates/open_ended_problems/combined_notifications.html
+++ b/lms/templates/open_ended_problems/combined_notifications.html
@@ -7,11 +7,7 @@
 <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Combined Notifications</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='open_ended'" />
 
diff --git a/lms/templates/open_ended_problems/open_ended_problems.html b/lms/templates/open_ended_problems/open_ended_problems.html
index 67c5ba8da3..68882984f5 100644
--- a/lms/templates/open_ended_problems/open_ended_problems.html
+++ b/lms/templates/open_ended_problems/open_ended_problems.html
@@ -7,11 +7,7 @@
 <%static:css group='course'/>
 </%block>
 
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Open Ended Problems").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Open Ended Problems</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Open Ended Problems").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='open_ended_problems'" />
 
diff --git a/lms/templates/static_htmlbook.html b/lms/templates/static_htmlbook.html
index 2b7702f5a4..60421502e6 100644
--- a/lms/templates/static_htmlbook.html
+++ b/lms/templates/static_htmlbook.html
@@ -2,12 +2,7 @@
 
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<<<<<<< HEAD
-<%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title>
-
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Textbook</title>
->>>>>>> add escaping
+<%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</title>
 </%block>
 
 <%block name="headextra">
diff --git a/lms/templates/static_pdfbook.html b/lms/templates/static_pdfbook.html
index e6cde45fd2..4e9f604a0c 100644
--- a/lms/templates/static_pdfbook.html
+++ b/lms/templates/static_pdfbook.html
@@ -3,16 +3,9 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
 <%block name="title">
-<<<<<<< HEAD
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-<title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title>
-
-=======
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>${course.display_number_with_default | h} Textbook</title>
->>>>>>> add escaping
+<title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</title>
 </%block>
 
 <%block name="headextra">
diff --git a/lms/templates/staticbook.html b/lms/templates/staticbook.html
index 443918ac75..09741e0a9e 100644
--- a/lms/templates/staticbook.html
+++ b/lms/templates/staticbook.html
@@ -2,11 +2,7 @@
 
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<<<<<<< HEAD
-<%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.display_number_with_default)}</title></%block>
-=======
-<%block name="title"><title>${course.display_number_with_default | h} Textbook</title></%block>
->>>>>>> add escaping
+<%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.display_number_with_default) | h}</title></%block>
 
 <%block name="headextra">
 <%static:css group='course'/>