diff --git a/app/config/app.php b/app/config/app.php
index ad43b45142..29836be22e 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -37,8 +37,13 @@ return [
         'Illuminate\Validation\ValidationServiceProvider',
         'Illuminate\View\ViewServiceProvider',
         'Illuminate\Workbench\WorkbenchServiceProvider',
+<<<<<<< HEAD
         //        'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
         //        'Barryvdh\Debugbar\ServiceProvider',
+=======
+        //'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
+        //'Barryvdh\Debugbar\ServiceProvider',
+>>>>>>> 051eeda9a04ce6ec8e4227b1ceff94086b15f371
         'FireflyIII\FF3ServiceProvider',
         'DaveJamesMiller\Breadcrumbs\ServiceProvider',
         'Grumpydictator\Gchart\GchartServiceProvider',