diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
index cd98744cb3..389ffad44f 100644
--- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
+++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts
@@ -104,11 +104,7 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear
                 const extraFreeSpace = 20;
                 this._fileSizeOperatorsMaxWidth = Math.max(...this._fileSizeOperators.map((operator) =>
                     this.getOperatorNameWidth(operator, this.getCanvasFont(this.fileSizeOperatorSelectElement.nativeElement)))) +
-<<<<<<< Updated upstream
-                    this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow').clientWidth +
-=======
                     this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow-wrapper').clientWidth +
->>>>>>> Stashed changes
                     extraFreeSpace;
             });
         }
diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss
index f34f16af3e..3ad972de1d 100644
--- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss
+++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss
@@ -6,13 +6,8 @@
             padding-top: 0;
             width: 100%;
         }
-<<<<<<< Updated upstream
-        /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */
-        .mat-select-value-text {
-=======
 
         .mat-mdc-select-value-text {
->>>>>>> Stashed changes
             font-size: var(--theme-body-1-font-size);
         }