diff --git a/src/Dashboard/Http/Middleware/Authorize.php b/src/Dashboard/Http/Middleware/Authorize.php
index 4398fb6..7d3b16f 100644
--- a/src/Dashboard/Http/Middleware/Authorize.php
+++ b/src/Dashboard/Http/Middleware/Authorize.php
@@ -1,10 +1,6 @@
 <?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;