diff --git a/src/InstallerServiceProvider.php b/src/InstallerServiceProvider.php
index 22803ea..27498ee 100644
--- a/src/InstallerServiceProvider.php
+++ b/src/InstallerServiceProvider.php
@@ -2,7 +2,11 @@
 
 namespace Laraxot\Installer;
 
+<<<<<<< HEAD
 use Laraxot\Installer\Commands\InstallCommand;
+=======
+use Laraxot\Installer\Commands\InstallerCommand;
+>>>>>>> 64e260f (Fix styling)
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;