Change label of unmerged changes based on user feedback

Author: isc-pbarton

git-webui/release/share/git-webui/webui/css/git-webui.css

@@ -982,7 +982,7 @@ body {
   right: 5px;
 }
 #changedFilesContainer .file-area .U::after {
-  content: "Unmerged";
+  content: "Merge Conflict";
   position: absolute;
   right: 5px;
   color: red;

git-webui/src/share/git-webui/webui/css/git-webui.less

@@ -985,7 +985,7 @@ body {
         }
 
         .U::after {
-            content: "Unmerged";
+            content: "Merge Conflict";
             position: absolute;
             right: 5px;
             color: red;