diff --git a/.gitignore b/.gitignore
index ed3c714..555a420 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 .env
-/ vendor/
+/vendor/
 .idea/
 logs/
 *.log
diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
index 590f3bd..3c46cb6 100755
--- a/src/Controllers/ApiController.php
+++ b/src/Controllers/ApiController.php
@@ -306,6 +306,7 @@ class ApiController
         ]);
     }
 
+<<<<<<< HEAD
     public function register(): void
     {
         $input = json_decode(file_get_contents('php://input'), true) ?? $_POST;