fix conflict

lms/static/sass/_discussion.scss

@@ -2421,6 +2421,7 @@ body.discussion {
       font-size: 12px;
       color: #888;
       float:right;
+      padding-right: 5px;
       font-style: italic; 
       width:100px;
     }  
@@ -2428,16 +2429,17 @@ body.discussion {
 .notflagged .icon
 {
   display: inline-block; 
-  width: 20px; 
-  height: 30px; 
+  width: 10px; 
+  height: 14px;
+  padding-right: 3px;
   background: transparent url('../images/notflagged.png') no-repeat 0 0; 
 }
 
 .flagged .icon
 {
   display: inline-block; 
-  width: 20px; 
-  height: 30px; 
+  width: 10px; 
+  height: 14px; 
+  padding-right: 3px;
   background: transparent url('../images/flagged.png') no-repeat 0 0; 
 }
-

lms/templates/discussion/_underscore_templates.html

@@ -113,7 +113,7 @@
     <div class="response-local"><div class="response-body">${"<%- body %>"}</div>
     
     <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">                
-      <i class="icon"></i>Report Misuse</div>
+      <i class="icon"></i><span class="flag-label">Report Misuse</span></div>
     </div>
     <ul class="moderator-actions response-local">
         <li style="display: none"><a class="action-edit" href="javascript:void(0)"><span class="edit-icon"></span> Edit</a></li>
@@ -137,7 +137,8 @@
 <script type="text/template" id="response-comment-show-template">
   <div id="comment_${'<%- id %>'}">
     <div class="response-body">${'<%- body %>'}</div>
-    
+    <div class="discussion-flag-abuse notflagged" data-role="thread-flag" data-tooltip="flag">                
+      <i class="icon"></i><span class="flag-label">Report Misuse</span></div> 
     <p class="posted-details">&ndash;posted <span class="timeago" title="${'<%- created_at %>'}">${'<%- created_at %>'}</span> by
         ${"<% if (obj.username) { %>"}
         <a href="${'<%- user_url %>'}" class="profile-link">${'<%- username %>'}</a>