diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 9b010c623b1be068ba52cafed387347f4f55658e..ada4022b66cac5e09461ff8320768d42db065cb1 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -233,7 +233,6 @@
   max-width: 100%;
 }
 
-<<<<<<< HEAD
 /*
 * Mixin that handles the container for the job logs (CI/CD and kubernetes pod logs)
 */
@@ -333,8 +332,6 @@
   animation: blinking-dots 1s linear infinite;
 }
 
-=======
->>>>>>> upstream/master
 @mixin borderless-status-icon($color) {
   svg {
     border: 1px solid $color;