diff --git a/config/websockets.php b/config/websockets.php
index f1676b5..c8df739 100644
--- a/config/websockets.php
+++ b/config/websockets.php
@@ -7,7 +7,7 @@ return [
 
     /**
      * This package comes with multi tenancy out of the box. Here you can
-     * configure the diffente clients that can use the webSockets server.
+     * configure the different clients that can use the webSockets server.
      *
      * You should make sure that the app id is numeric.
      */
diff --git a/src/Dashboard/Http/Middleware/Authorize.php b/src/Dashboard/Http/Middleware/Authorize.php
index 85e4c58..38a00cd 100644
--- a/src/Dashboard/Http/Middleware/Authorize.php
+++ b/src/Dashboard/Http/Middleware/Authorize.php
@@ -1,6 +1,10 @@
 <?php
 
+<<<<<<< HEAD:src/Dashboard/Http/Middleware/Authorize.php
 namespace BeyondCode\LaravelWebsockets\Dashboard\Http\Middleware;
+=======
+namespace BeyondCode\LaravelWebSockets\Http\Middleware;
+>>>>>>> 224845d6fd754bb8f608af61675ef0519c5d2b1d:src/Http/Middleware/Authorize.php
 
 use Illuminate\Support\Facades\Gate;
 
diff --git a/src/LaravelEcho/WebSocket/PusherServer.php b/src/LaravelEcho/WebSocket/PusherServer.php
index b4bc693..5ea0806 100644
--- a/src/LaravelEcho/WebSocket/PusherServer.php
+++ b/src/LaravelEcho/WebSocket/PusherServer.php
@@ -10,7 +10,7 @@ use Ratchet\RFC6455\Messaging\MessageInterface;
 use BeyondCode\LaravelWebSockets\WebSocketController;
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
 use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
-use BeyondCode\LaravelWebsockets\LaravelEcho\Pusher\Exceptions\PusherException;
+use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\PusherException;
 use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKeyException;
 
 class PusherServer extends WebSocketController