diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 72e2a376..45e88166 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -16,10 +16,6 @@ export const appConfig: ApplicationConfig = {
     provideAnimations(),
     provideCharts(withDefaultRegisterables()),
     importProvidersFrom(
-<<<<<<< HEAD
-      // AngularFireModule.initializeApp(environment.firebase),
-=======
->>>>>>> 57a78d474e29f841480fe608029878e17ea5f325
       ToastrModule.forRoot({
         timeOut: 1500,
         closeButton: true,