Resolve conflict in bootstrap_migration.scss

app/assets/stylesheets/bootstrap_migration.scss

@@ -111,14 +111,11 @@ code {
     background-color: inherit;
     padding: unset;
   }
-<<<<<<< HEAD
-=======
 
   .build-trace & {
     background-color: inherit;
     padding: inherit;
   }
->>>>>>> upstream/master
 }
 
 .code {