diff --git a/firefox-ios/Client/Redux/GlobalState/AppState.swift b/firefox-ios/Client/Redux/GlobalState/AppState.swift
index 1c47105ba12b4..308e902f4fc77 100644
--- a/firefox-ios/Client/Redux/GlobalState/AppState.swift
+++ b/firefox-ios/Client/Redux/GlobalState/AppState.swift
@@ -64,11 +64,8 @@ let middlewares = [
     TabManagerMiddleware().tabsPanelProvider,
     ThemeManagerMiddleware().themeManagerProvider,
     ToolbarMiddleware().toolbarProvider,
-<<<<<<< HEAD
     SearchEngineSelectionMiddleware().searchEngineSelectionProvider,
-=======
     TopSitesMiddleware().topSitesProvider,
->>>>>>> 58ed566cce (Add FXIOS-10165 [Homepage] Add initial Top Sites Section)
     TrackingProtectionMiddleware().trackingProtectionProvider,
     PasswordGeneratorMiddleware().passwordGeneratorProvider,
     PocketMiddleware().pocketSectionProvider