studio - alerts: resolving local master merge conflcits

cms/templates/base.html

@@ -6,12 +6,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>
-    <%block name="title"></%block> | 
-    % if context_course:
-      <% ctx_loc = context_course.location %>
-      ${context_course.display_name} | 
-      % endif
-      edX Studio
+        <%block name="title"></%block> |
+        % if context_course:
+        <% ctx_loc = context_course.location %>
+        ${context_course.display_name_with_default} |
+        % endif
+        edX Studio
     </title>
 
     <meta name="viewport" content="width=device-width,initial-scale=1">
@@ -66,4 +66,4 @@
 
     <%block name="jsextra"></%block>
   </body>
-</html>
+</html>