solves merge conflict in _iconfont.scss

refs #16082, refs #15646

themes/fid_adlr/scss/_iconfont.scss

@@ -38,10 +38,22 @@ $imo-css-prefix: 'icon' !default;
   -webkit-font-smoothing: antialiased;
 }
 
+.#{$imo-css-prefix}-1\.5x {
+  font-size: 150%;
+}
+
 .#{$imo-css-prefix}-2x {
   font-size: 200%;
 }
 
+.#{$imo-css-prefix}-3x {
+  font-size: 300%;
+}
+
+.#{$imo-css-prefix}-4x {
+  font-size: 400%;
+}
+
 // Icons are sorted by hex value
 .#{$imo-css-prefix}-alert-circle::before {
   content: '\e900';