diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 90c98429a8..c2a3a8b850 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -2691,20 +2691,35 @@ display:none;
   }
 }
 
+<<<<<<< HEAD
 .notflagged .icon
 {
   display: block;
+=======
+    }  
+    
+.notflagged .icon {
+  display: block; 
+>>>>>>> updated flag icons to be font-awesome based
   float: left;
   margin: 3px;
   width: 10px;
   height: 14px;
   padding-right: 3px;
+<<<<<<< HEAD
 }
 
 .flagged .icon
 {
   display: block;
   color: $gray-l2;
+=======
+  color: $gray-l2;
+}
+
+.flagged .icon {
+  display: block; 
+>>>>>>> updated flag icons to be font-awesome based
   float: left;
   margin: 3px;
   width: 10px;
diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html
index 8dfce3e63b..097784807c 100644
--- a/lms/templates/discussion/_underscore_templates.html
+++ b/lms/templates/discussion/_underscore_templates.html
@@ -47,18 +47,18 @@
       </header>
 
       <div class="post-body">${'<%- body %>'}</div>
-      <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">                
-      <i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>      
+      <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="Report Misuse">
+      <i class="icon icon-flag"></i><span class="flag-label">Report Misuse</span></div>
         
         
       % if course and has_permission(user, 'openclose_thread', course.id):
-      <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
-      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div> 
+      <div class="admin-pin discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
+      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
 
       %else:
       ${"<% if (pinned) { %>"}
-      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">                
-      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div> 
+      <div class="discussion-pin notpinned" data-role="thread-pin" data-tooltip="pin this thread">
+      <i class="icon icon-pushpin"></i><span class="pin-label">Pin Thread</span></div>
       ${"<% }  %>"}  
       % endif