diff --git a/app/styles/modules/backlog/taskboard-table.scss b/app/styles/modules/backlog/taskboard-table.scss
index 50a4e860..45d8099b 100644
--- a/app/styles/modules/backlog/taskboard-table.scss
+++ b/app/styles/modules/backlog/taskboard-table.scss
@@ -59,19 +59,12 @@ $column-margin: 0 10px 0 0;
     }
     .task-colum-name {
         @extend %large;
-<<<<<<< HEAD
-        @include table-flex();
-        background: $whitish;
-        border-top: 3px solid $gray-light;
-        flex: auto 0 auto;
-=======
         background: $whitish;
         border-top: 3px solid $gray-light;
         display: flex;
         flex-basis: $column-width;
         flex-grow: $column-flex;
         flex-shrink: $column-shrink;
->>>>>>> Removed flexbox mixins to vanilla CSS
         justify-content: space-between;
         margin: $column-margin;
         max-width: $column-width;
diff --git a/app/styles/modules/common/related-tasks.scss b/app/styles/modules/common/related-tasks.scss
index 34624b6f..8e794345 100644
--- a/app/styles/modules/common/related-tasks.scss
+++ b/app/styles/modules/common/related-tasks.scss
@@ -113,6 +113,7 @@
             white-space: nowrap;
         }
         input {
+            @extend %medium;
             margin-right: 1rem;
             padding: 3px;
             width: 85%;
@@ -123,8 +124,7 @@
             text-align: center;
             width: 100%;
             span {
-                animation: loading .5s linear;
-                animation: spin 1s linear infinite;
+                animation: loading .5s linear, spin 1s linear infinite;
             }
         }
     }
@@ -209,7 +209,7 @@
         display: flex;
         img {
             flex-basis: 35px;
-            /* width & height they are only required for IE */
+            // width & height they are only required for IE
             height: 35px;
             width: 35px;
         }
diff --git a/app/styles/modules/search/search-result-table.scss b/app/styles/modules/search/search-result-table.scss
index e2992019..dbce9244 100644
--- a/app/styles/modules/search/search-result-table.scss
+++ b/app/styles/modules/search/search-result-table.scss
@@ -28,9 +28,9 @@
             text-align: center;
         }
         .assigned-to {
-            padding: 0 1rem;
             flex-basis: 250px;
             flex-grow: 1;
+            padding: 0 1rem;
         }
     }
     .row-selected {
diff --git a/app/styles/modules/wiki/wiki-nav.scss b/app/styles/modules/wiki/wiki-nav.scss
index 78f9f928..aa8421a4 100644
--- a/app/styles/modules/wiki/wiki-nav.scss
+++ b/app/styles/modules/wiki/wiki-nav.scss
@@ -42,8 +42,7 @@
                 float: none;
             }
             span {
-                animation: loading .5s linear;
-                animation: spin 1s linear infinite;
+                animation: loading .5s linear, spin 1s linear infinite;
             }
         }
     }