fixes conflicts with frontend code

app/assets/stylesheets/pages/projects.scss

@@ -101,83 +101,74 @@
     margin-bottom: 0px;
   }
 
-<<<<<<< HEAD
+  .count-buttons {
+    display: block;
+    margin-bottom: 12px;
+  }
+
   .btn {
     @include btn-gray;
+    text-transform: none;
+  }
+  .count-with-arrow {
+    display: inline-block;
+    position: relative;
+    margin-left: 4px;
 
-    .count {
-      display: inline-block;
-=======
-    .count-buttons {
-      display: block;
-      margin-bottom: 12px;
-    }
+    .arrow {
+      &:before {
+        content: '';
+        display: inline-block;
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-color: transparent;
+        border-style: solid;
+        top: 50%;
+        left: 0;
+        margin-top: -6px;
+        border-width: 7px 5px 7px 0;
+        border-right-color: #dce0e5;
+      }
 
-    .btn {
-      @include btn-gray;
-      text-transform: none;
+      &:after {
+        content: '';
+        position: absolute;
+        width: 0;
+        height: 0;
+        border-color: transparent;
+        border-style: solid;
+        top: 50%;
+        left: 1px;
+        margin-top: -9px;
+        border-width: 10px 7px 10px 0;
+        border-right-color: #FFF;
+      }
     }
-    .count-with-arrow {
+    .count {
+      @include btn-gray;
       display: inline-block;
-      position: relative;
-      margin-left: 4px;
-
-      .arrow {
-        &:before {
-          content: '';
-          display: inline-block;
-          position: absolute;
-          width: 0;
-          height: 0;
-          border-color: transparent;
-          border-style: solid;
-          top: 50%;
-          left: 0;
-          margin-top: -6px;
-          border-width: 7px 5px 7px 0;
-          border-right-color: #dce0e5;
-        }
-
-        &:after {
-          content: '';
-          position: absolute;
-          width: 0;
-          height: 0;
-          border-color: transparent;
-          border-style: solid;
-          top: 50%;
-          left: 1px;
-          margin-top: -9px;
-          border-width: 10px 7px 10px 0;
-          border-right-color: #FFF;
-        }
-      }
-      .count {
-        @include btn-gray;
-        display: inline-block;
-        background: white;
-        border-radius: 2px;
-        border-width: 1px;
-        border-style: solid;
-        font-size: 13px;
-        font-weight: 600;
-        line-height: 20px;
-        padding: 11px 16px;
-        letter-spacing: .4px;
-        padding: 10px;
-        text-align: center;
-        vertical-align: middle;
-        touch-action: manipulation;
-        cursor: pointer;
-        background-image: none;
-        white-space: nowrap;
-        margin: 0 11px 0px 4px;
-
-        &:hover {
-          background: #FFF;
-        }
+      background: white;
+      border-radius: 2px;
+      border-width: 1px;
+      border-style: solid;
+      font-size: 13px;
+      font-weight: 600;
+      line-height: 20px;
+      padding: 11px 16px;
+      letter-spacing: .4px;
+      padding: 10px;
+      text-align: center;
+      vertical-align: middle;
+      touch-action: manipulation;
+      cursor: pointer;
+      background-image: none;
+      white-space: nowrap;
+      margin: 0 11px 0px 4px;
+
+      &:hover {
+        background: #FFF;
       }
->>>>>>> origin/master
     }
   }
 }

app/views/shared/_clone_panel.html.haml

 - project = project || @project
-<<<<<<< HEAD
-.git-clone-holder.input-group
-  .input-group-addon.git-protocols
-    .input-group-btn
-      = ssh_clone_button(project)
-    .input-group-btn
-      = http_clone_button(project)
-    - if alternative_kerberos_url?
-      .input-group-btn
-        = kerberos_clone_button(project)
-=======
 
 .git-clone-holder
   .btn-group.clone-options
@@ -24,8 +13,11 @@
       %li
         %a#http-selector{href: @project.http_url_to_repo}
           HTTPS
+      - if alternative_kerberos_url?
+      %li
+        %a#kerberos-btn{href: @project.kerberos_url_to_repo}
+          KRB5
 
->>>>>>> origin/master
   = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true
   .input-group-btn
     = clipboard_button(clipboard_target: '#project_clone')