diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index f10d079..1785f6c 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -11,12 +11,9 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-<<<<<<< HEAD
         $this->call(LaratrustSeeder::class);
         $this->call(UsersTableSeeder::class);
-=======
          //$this->call(UsersTableSeeder::class);
          $this->call(SoSeeder::class);
->>>>>>> 9619cab40743a5e70ea341c611c68500f2a047fe
     }
 }