исправил конфликты после обновления ветки

app/Http/Controllers/Users/UserController.php

@@ -0,0 +1,35 @@
+<?php
+
+
+namespace App\Http\Controllers\Users;
+
+use App\Http\Controllers\Controller;
+
+
+class UserController extends Controller
+{
+
+    public function getUser()
+    {
+        switch(auth()->user()->role->name)
+        {
+            case 'student':
+                $user = auth()->user()->student;
+                break;
+
+            case 'teacher':
+                $user = auth()->user()->teacher;
+                break;
+
+            case 'headteacher':
+            $user = auth()->user()->headteacher;
+                break;
+
+            case 'parent':
+                $user = auth()->user()->parent;
+                break;
+        }
+        return response()->json($user);
+    }
+
+}