diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
index 3c46cb6..590f3bd 100755
--- a/src/Controllers/ApiController.php
+++ b/src/Controllers/ApiController.php
@@ -306,7 +306,6 @@ class ApiController
         ]);
     }
 
-<<<<<<< HEAD
     public function register(): void
     {
         $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;