diff --git a/app/Http/Controllers/Admin/EmployersController.php b/app/Http/Controllers/Admin/EmployersController.php
index 5ef6a60..a3dfb36 100644
--- a/app/Http/Controllers/Admin/EmployersController.php
+++ b/app/Http/Controllers/Admin/EmployersController.php
@@ -3,17 +3,12 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-<<<<<<< HEAD
-use App\Models\User;
-use Illuminate\Http\Request;
-=======
 use App\Models\Answer;
 use App\Models\Employer;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
 class EmployersController extends Controller
 {
@@ -31,8 +26,6 @@ class EmployersController extends Controller
             return view('admin.employer.index', compact('users'));
         }
     }
-<<<<<<< HEAD
-=======
 
     public function form_update_employer(Employer $employer) {
         return view('admin.employer.edit', compact('employer'));
@@ -119,5 +112,4 @@ class EmployersController extends Controller
     }
 
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Http/Controllers/Admin/UsersController.php b/app/Http/Controllers/Admin/UsersController.php
index 6d9372b..57bbbd3 100644
--- a/app/Http/Controllers/Admin/UsersController.php
+++ b/app/Http/Controllers/Admin/UsersController.php
@@ -5,19 +5,13 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use Illuminate\Http\Request;
-<<<<<<< HEAD
-=======
 use Illuminate\Support\Facades\Auth;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
 class UsersController extends Controller
 {
     public function index(Request $request) {
-<<<<<<< HEAD
-=======
         $title = 'Админка - Пользователи системы';
         $id_admin = Auth::user()->id;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         if ($request->ajax()) {
             $user = User::find($request->id);
             $request->offsetUnset('id');
@@ -27,14 +21,6 @@ class UsersController extends Controller
         $users = User::query()->paginate(15);
 
         if ($request->ajax()) {
-<<<<<<< HEAD
-           return view('admin.users.index_ajax', compact('users'));
-        } else {
-            return view('admin.users.index', compact('users'));
-        }
-    }
-
-=======
            return view('admin.users.index_ajax', compact('users', 'id_admin'));
         } else {
             return view('admin.users.index', compact('users', 'title', 'id_admin'));
@@ -56,5 +42,4 @@ class UsersController extends Controller
             return view('admin.users.roles.index', compact('users'));
         }
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Http/Controllers/Admin/WorkersController.php b/app/Http/Controllers/Admin/WorkersController.php
index 9ac8498..9c287d7 100644
--- a/app/Http/Controllers/Admin/WorkersController.php
+++ b/app/Http/Controllers/Admin/WorkersController.php
@@ -4,10 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
-<<<<<<< HEAD
-=======
 use App\Models\Worker;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use Illuminate\Http\Request;
 
 class WorkersController extends Controller
@@ -27,8 +24,6 @@ class WorkersController extends Controller
             return view('admin.worker.index', compact('users'));
         }
     }
-<<<<<<< HEAD
-=======
 
     public function form_update_worker(Worker $worker) {
         return view('admin.worker.edit');
@@ -39,5 +34,4 @@ class WorkersController extends Controller
         return;
     }
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Ad_employer.php b/app/Models/Ad_employer.php
index 610d06b..2bd9d4d 100644
--- a/app/Models/Ad_employer.php
+++ b/app/Models/Ad_employer.php
@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class Ad_employer extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
 
     protected $fillable = [
         'name',
@@ -51,5 +49,4 @@ class Ad_employer extends Model
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Category.php b/app/Models/Category.php
index 3ce6823..5434c3e 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class Category extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
 
     protected $fillable = [
         'name',
@@ -19,5 +17,4 @@ class Category extends Model
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Employer.php b/app/Models/Employer.php
index 6c7a341..78cc299 100644
--- a/app/Models/Employer.php
+++ b/app/Models/Employer.php
@@ -21,15 +21,12 @@ class Employer extends Model
         'address',
         'map',
         'site',
-<<<<<<< HEAD
-=======
         'coord',
         'plus',
         'is_remove',
         'oficial_status',
         'social_is',
         'sending_is',
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         ];
 
     /*
@@ -39,8 +36,6 @@ class Employer extends Model
         return $this->belongsTo(User::class, 'user_id');
     }
 
-<<<<<<< HEAD
-=======
     /*
     * Связь Работодателя с вакансиями
     */
@@ -52,5 +47,4 @@ class Employer extends Model
         return $query->where('is_remove', '=', '0');
     }
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Group_user.php b/app/Models/Group_user.php
index 40dce84..4a135c9 100644
--- a/app/Models/Group_user.php
+++ b/app/Models/Group_user.php
@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class Group_user extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
 
     protected $fillable = [
         'name_group',
@@ -45,5 +43,4 @@ class Group_user extends Model
         return $query->where('is_remove', '=', '0');
     }
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Job_title.php b/app/Models/Job_title.php
index e2b366b..ff9bb38 100644
--- a/app/Models/Job_title.php
+++ b/app/Models/Job_title.php
@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class Job_title extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
 
     protected $fillable = [
         'name',
@@ -34,5 +32,4 @@ class Job_title extends Model
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/Message.php b/app/Models/Message.php
index 1086f93..fcb867d 100644
--- a/app/Models/Message.php
+++ b/app/Models/Message.php
@@ -8,8 +8,6 @@ use Illuminate\Database\Eloquent\Model;
 class Message extends Model
 {
     use HasFactory;
-<<<<<<< HEAD
-=======
 
     /*
      * Связь таблицы Message с таблицей User (Отправитель)
@@ -31,5 +29,4 @@ class Message extends Model
     public function response() {
         return $this->hasMany(ad_response::class);
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index eea8cbb..d12dbf4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -59,11 +59,7 @@ class User extends Authenticatable
      * users - employers
     */
     public function employers() {
-<<<<<<< HEAD
-        return $this->hasMany(Employer::class);
-=======
         return $this->hasMany(Employer::class, 'user_id');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     }
 
     /*
@@ -71,17 +67,6 @@ class User extends Authenticatable
      * users - workers
     */
     public function workers() {
-<<<<<<< HEAD
-        return $this->hasMany(Worker::class);
-    }
-
-    /*
-      * Связь Пользователей системы с группами юзеров
-      * users - group_users
-    */
-    public function groups() {
-        return $this->hasMany(Group_user::class);
-=======
         return $this->hasMany(Worker::class, 'user_id');
     }
 
@@ -92,7 +77,6 @@ class User extends Authenticatable
    */
     public function ingroup() {
         return $this->belongsToMany(Group_user::class, 'group_works');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     }
 
     /*
@@ -111,8 +95,6 @@ class User extends Authenticatable
         return $this->hasMany(Static_worker::class);
     }
 
-<<<<<<< HEAD
-=======
     /*
     * Связь модели Юзеры (users) с моделью Группы пользователей (Group_works)
         один-ко-многим
@@ -124,6 +106,5 @@ class User extends Authenticatable
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
 }
diff --git a/app/Models/Worker.php b/app/Models/Worker.php
index 5b11206..d5ab505 100644
--- a/app/Models/Worker.php
+++ b/app/Models/Worker.php
@@ -39,12 +39,9 @@ class Worker extends Model
         'text',
         'address',
         'city',
-<<<<<<< HEAD
-=======
         'coord',
         'file',
         'is_remove',
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     ];
 
     /*
@@ -53,11 +50,8 @@ class Worker extends Model
     public function users() {
         return $this->belongsTo(User::class, 'user_id');
     }
-<<<<<<< HEAD
-=======
 
     public function scopeActive($query) {
         return $query->where('is_remove', '=', '0');
     }
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 }
diff --git a/composer.json b/composer.json
index d9d44f9..5593579 100644
--- a/composer.json
+++ b/composer.json
@@ -14,12 +14,8 @@
         "laravel/framework": "^9.19",
         "laravel/sanctum": "^3.0",
         "laravel/tinker": "^2.7",
-<<<<<<< HEAD
-        "laravel/ui": "^4.2"
-=======
         "laravel/ui": "^4.2",
       "ext-http": "*"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",
diff --git a/config/app.php b/config/app.php
index 39cb54e..fa866cd 100644
--- a/config/app.php
+++ b/config/app.php
@@ -194,11 +194,8 @@ return [
         // App\Providers\BroadcastServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-<<<<<<< HEAD
-
-=======
         App\Providers\MyServiceProvider::class,
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
+
     ],
 
     /*
diff --git a/database/migrations/2023_05_16_081308_create_static_workers_table.php b/database/migrations/2023_05_16_081308_create_static_workers_table.php
index b8b3730..201ee02 100644
--- a/database/migrations/2023_05_16_081308_create_static_workers_table.php
+++ b/database/migrations/2023_05_16_081308_create_static_workers_table.php
@@ -17,10 +17,6 @@ return new class extends Migration
             $table->id();
             $table->bigInteger('user_id')->nullable(false);
             $table->integer('lookin')->default(0);
-<<<<<<< HEAD
-            $table->string('month_year', 255)->nullable();
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->integer('message')->default(0);
             $table->timestamps();
         });
diff --git a/database/migrations/2023_05_16_081330_create_static_ads_table.php b/database/migrations/2023_05_16_081330_create_static_ads_table.php
index 7fe6d7a..aed2843 100644
--- a/database/migrations/2023_05_16_081330_create_static_ads_table.php
+++ b/database/migrations/2023_05_16_081330_create_static_ads_table.php
@@ -17,10 +17,6 @@ return new class extends Migration
             $table->id();
             $table->bigInteger('ad_employer_id')->nullable(false);
             $table->integer('lookin')->default(0);
-<<<<<<< HEAD
-            $table->string('month_year', 255)->nullable();
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->integer('message')->default(0);
             $table->timestamps();
         });
diff --git a/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php b/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php
index a9c47e3..83389dd 100644
--- a/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php
+++ b/database/migrations/2023_05_16_092746_alter_ad_jobs_table.php
@@ -15,11 +15,6 @@ return new class extends Migration
     {
         Schema::create('ad_jobs', function (Blueprint $table) {
             $table->id();
-<<<<<<< HEAD
-            $table->bigInteger('ad_employer_id')->nullable(false);
-            $table->bigInteger('job_title_id')->nullable(false);
-=======
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             $table->timestamps();
         });
     }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index 6b42ca2..dcb8859 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -14,8 +14,6 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
-<<<<<<< HEAD
-=======
         $this->call(EmployersMainSeeder::class);
         $this->command->info('Таблица работодатели на главной загружена!');
 
@@ -23,7 +21,6 @@ class DatabaseSeeder extends Seeder
         $this->command->info('Таблица должности на главной загружена!');
 
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         // \App\Models\User::factory(10)->create();
 
         // \App\Models\User::factory()->create([
diff --git a/resources/views/admin/config.blade.php b/resources/views/admin/config.blade.php
index 2c0eecd..b3b25de 100644
--- a/resources/views/admin/config.blade.php
+++ b/resources/views/admin/config.blade.php
@@ -1,276 +1,6 @@
 @extends('layout.admin', ['title' => 'Админка - Настройки'])
 
 @section('content')
-<<<<<<< HEAD
-    <h4
-        class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
-    >
-        Elements
-    </h4>
-    <div
-        class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
-    >
-        <label class="block text-sm">
-            <span class="text-gray-700 dark:text-gray-400">Name</span>
-            <input
-                class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-                placeholder="Jane Doe"
-            />
-        </label>
-
-        <div class="mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Account Type
-                </span>
-            <div class="mt-2">
-                <label
-                    class="inline-flex items-center text-gray-600 dark:text-gray-400"
-                >
-                    <input
-                        type="radio"
-                        class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                        name="accountType"
-                        value="personal"
-                    />
-                    <span class="ml-2">Personal</span>
-                </label>
-                <label
-                    class="inline-flex items-center ml-6 text-gray-600 dark:text-gray-400"
-                >
-                    <input
-                        type="radio"
-                        class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                        name="accountType"
-                        value="busines"
-                    />
-                    <span class="ml-2">Business</span>
-                </label>
-            </div>
-        </div>
-
-        <label class="block mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Requested Limit
-                </span>
-            <select
-                class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-select focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-            >
-                <option>$1,000</option>
-                <option>$5,000</option>
-                <option>$10,000</option>
-                <option>$25,000</option>
-            </select>
-        </label>
-
-        <label class="block mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Multiselect
-                </span>
-            <select
-                class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-multiselect focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                multiple
-            >
-                <option>Option 1</option>
-                <option>Option 2</option>
-                <option>Option 3</option>
-                <option>Option 4</option>
-                <option>Option 5</option>
-            </select>
-        </label>
-
-        <label class="block mt-4 text-sm">
-            <span class="text-gray-700 dark:text-gray-400">Message</span>
-            <textarea
-                class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 form-textarea focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                rows="3"
-                placeholder="Enter some long form content."
-            ></textarea>
-        </label>
-
-        <div class="flex mt-6 text-sm">
-            <label class="flex items-center dark:text-gray-400">
-                <input
-                    type="checkbox"
-                    class="text-purple-600 form-checkbox focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                />
-                <span class="ml-2">
-                    I agree to the
-                    <span class="underline">privacy policy</span>
-                  </span>
-            </label>
-        </div>
-    </div>
-
-    <!-- Validation inputs -->
-    <h4
-        class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
-    >
-        Validation
-    </h4>
-    <div
-        class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
-    >
-        <!-- Invalid input -->
-        <label class="block text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Invalid input
-                </span>
-            <input
-                class="block w-full mt-1 text-sm border-red-600 dark:text-gray-300 dark:bg-gray-700 focus:border-red-400 focus:outline-none focus:shadow-outline-red form-input"
-                placeholder="Jane Doe"
-            />
-            <span class="text-xs text-red-600 dark:text-red-400">
-                  Your password is too short.
-                </span>
-        </label>
-
-        <!-- Valid input -->
-        <label class="block mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Valid input
-                </span>
-            <input
-                class="block w-full mt-1 text-sm border-green-600 dark:text-gray-300 dark:bg-gray-700 focus:border-green-400 focus:outline-none focus:shadow-outline-green form-input"
-                placeholder="Jane Doe"
-            />
-            <span class="text-xs text-green-600 dark:text-green-400">
-                  Your password is strong.
-                </span>
-        </label>
-
-        <!-- Helper text -->
-        <label class="block mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Helper text
-                </span>
-            <input
-                class="block w-full mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
-                placeholder="Jane Doe"
-            />
-            <span class="text-xs text-gray-600 dark:text-gray-400">
-                  Your password must be at least 6 characters long.
-                </span>
-        </label>
-    </div>
-
-    <!-- Inputs with icons -->
-    <h4
-        class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
-    >
-        Icons
-    </h4>
-    <div
-        class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
-    >
-        <label class="block text-sm">
-            <span class="text-gray-700 dark:text-gray-400">Icon left</span>
-            <!-- focus-within sets the color for the icon when input is focused -->
-            <div
-                class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
-            >
-                <input
-                    class="block w-full pl-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
-                    placeholder="Jane Doe"
-                />
-                <div
-                    class="absolute inset-y-0 flex items-center ml-3 pointer-events-none"
-                >
-                    <svg
-                        class="w-5 h-5"
-                        aria-hidden="true"
-                        fill="none"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                        stroke-width="2"
-                        viewBox="0 0 24 24"
-                        stroke="currentColor"
-                    >
-                        <path
-                            d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
-                        ></path>
-                    </svg>
-                </div>
-            </div>
-        </label>
-
-        <label class="block mt-4 text-sm">
-            <span class="text-gray-700 dark:text-gray-400">Icon right</span>
-            <!-- focus-within sets the color for the icon when input is focused -->
-            <div
-                class="relative text-gray-500 focus-within:text-purple-600 dark:focus-within:text-purple-400"
-            >
-                <input
-                    class="block w-full pr-10 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
-                    placeholder="Jane Doe"
-                />
-                <div
-                    class="absolute inset-y-0 right-0 flex items-center mr-3 pointer-events-none"
-                >
-                    <svg
-                        class="w-5 h-5"
-                        aria-hidden="true"
-                        fill="none"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                        stroke-width="2"
-                        viewBox="0 0 24 24"
-                        stroke="currentColor"
-                    >
-                        <path
-                            d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
-                        ></path>
-                    </svg>
-                </div>
-            </div>
-        </label>
-    </div>
-
-    <!-- Inputs with buttons -->
-    <h4
-        class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300"
-    >
-        Buttons
-    </h4>
-    <div
-        class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800"
-    >
-        <label class="block text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Button left
-                </span>
-            <div class="relative">
-                <input
-                    class="block w-full pl-20 mt-1 text-sm dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
-                    placeholder="Jane Doe"
-                />
-                <button
-                    class="absolute inset-y-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-l-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
-                >
-                    Click
-                </button>
-            </div>
-        </label>
-
-        <label class="block mt-4 text-sm">
-                <span class="text-gray-700 dark:text-gray-400">
-                  Button right
-                </span>
-            <div
-                class="relative text-gray-500 focus-within:text-purple-600"
-            >
-                <input
-                    class="block w-full pr-20 mt-1 text-sm text-black dark:text-gray-300 dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray form-input"
-                    placeholder="Jane Doe"
-                />
-                <button
-                    class="absolute inset-y-0 right-0 px-4 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-r-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple"
-                >
-                    Click
-                </button>
-            </div>
-        </label>
-    </div>
-=======
     <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
         Реквизиты сайта (конфигурация)
     </h4>
@@ -456,5 +186,4 @@
         </div>
     </div>
     </form>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @endsection
diff --git a/resources/views/admin/employer/index.blade.php b/resources/views/admin/employer/index.blade.php
index e500afb..5471ebb 100644
--- a/resources/views/admin/employer/index.blade.php
+++ b/resources/views/admin/employer/index.blade.php
@@ -22,11 +22,7 @@
                     success: function (data) {
                         console.log('Обновление таблицы пользователей ');
                         //data = JSON.parse(data);
-<<<<<<< HEAD
-                        console.log(data);
-=======
                         //console.log(data);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         ajax_block.html(data);
                     },
                     headers: {
@@ -42,8 +38,6 @@
     </script>
 @endsection
 
-<<<<<<< HEAD
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
@@ -73,7 +67,6 @@
     </form>
 @endsection
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
         <div class="w-full overflow-x-auto">
@@ -88,11 +81,7 @@
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
@@ -128,12 +117,6 @@
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
@@ -142,7 +125,6 @@
                             @if ($user->id > 1)
                             <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
diff --git a/resources/views/admin/employer/index_ajax.blade.php b/resources/views/admin/employer/index_ajax.blade.php
index 6906e43..4b39960 100644
--- a/resources/views/admin/employer/index_ajax.blade.php
+++ b/resources/views/admin/employer/index_ajax.blade.php
@@ -10,11 +10,7 @@
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
@@ -50,12 +46,6 @@
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
@@ -64,7 +54,6 @@
                             @if ($user->id > 1)
                                 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php
index 826d609..9a1dbcb 100644
--- a/resources/views/admin/index.blade.php
+++ b/resources/views/admin/index.blade.php
@@ -214,11 +214,7 @@
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-                                <p class="font-semibold"><a href="{{ route('admin.categories') }}">Категории</a></p>
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.categories.index') }}">Категории</a></p>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник категории (по умолчанию: река, море, река-море)
                                 </p>
@@ -245,15 +241,9 @@
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-                                <p class="font-semibold"><a href="{{ route('admin.job-titles') }}">Должности</a></p>
-                                <p class="text-xs text-gray-600 dark:text-gray-400">
-                                    Все должности
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.job-titles.index') }}">Должности</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник должности (все должности проекта)
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 </p>
                             </div>
                         </div>
@@ -278,8 +268,6 @@
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
-<<<<<<< HEAD
-=======
                                 <p class="font-semibold"><a href="{{ route('admin.infobloks.index') }}">Документы-Дипломы</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Справочник документы-дипломы (все блоки-документы необходимые соискателю)
@@ -307,7 +295,6 @@
                                 <div class="absolute inset-0 rounded-full shadow-inner" aria-hidden="true"></div>
                             </div>
                             <div>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                                 <p class="font-semibold"><a href="{{ route('admin.messages') }}">Сообщения</a></p>
                                 <p class="text-xs text-gray-600 dark:text-gray-400">
                                     Все сообщения сайта
@@ -355,9 +342,6 @@
                     </td>
                 </tr>
 
-<<<<<<< HEAD
-
-=======
                 <tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
                         <div class="flex items-center text-sm">
@@ -464,7 +448,6 @@
                         сентябрь 2023
                     </td>
                 </tr>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
                 <!--<tr class="text-gray-700 dark:text-gray-400">
                     <td class="px-4 py-3">
diff --git a/resources/views/admin/profile.blade.php b/resources/views/admin/profile.blade.php
index 9264fb2..e1794a1 100644
--- a/resources/views/admin/profile.blade.php
+++ b/resources/views/admin/profile.blade.php
@@ -4,21 +4,14 @@
     <h4 class="mb-4 text-lg font-semibold text-gray-600 dark:text-gray-300">
         Личные данные
     </h4>
-<<<<<<< HEAD
-=======
     <form method="POST" action="">
         @csrf
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
     <div class="px-4 py-3 mb-8 bg-white rounded-lg shadow-md dark:bg-gray-800">
         <label class="block text-sm">
             <span class="text-gray-700 dark:text-gray-400">Имя/Псевдоним/Имя компании</span>
             <input name="name" id="name"
                 class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                placeholder="Псевдоним для админки"
-=======
                 placeholder="Псевдоним для админки" value="{{ old('name') ?? $user->name ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('name')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -31,11 +24,7 @@
             <span class="text-gray-700 dark:text-gray-400">Email</span>
             <input name="email" id="email"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Почта"
-=======
                    placeholder="Почта" value="{{ old('email') ?? $user->email ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('email')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -48,11 +37,7 @@
             <span class="text-gray-700 dark:text-gray-400">Телефон</span>
             <input name="telephone" id="telephone"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Телефон"
-=======
                    placeholder="Телефон" value="{{ old('telephone') ?? $user->telephone ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('telephone')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -65,11 +50,7 @@
             <span class="text-gray-700 dark:text-gray-400">Фамилия</span>
             <input name="surname" id="surname"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Фамилия"
-=======
                    placeholder="Фамилия" value="{{ old('surname') ?? $user->surname ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('surname')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -82,11 +63,7 @@
             <span class="text-gray-700 dark:text-gray-400">Имя человека</span>
             <input name="name_man" id="name_man"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Имя человека"
-=======
                    placeholder="Имя человека" value="{{ old('name_man') ?? $user->name_man ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('name_man')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -99,11 +76,7 @@
             <span class="text-gray-700 dark:text-gray-400">Отчество</span>
             <input name="surname2" id="surname2"
                    class="block w-full mt-1 text-sm dark:border-gray-600 dark:bg-gray-700 focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:text-gray-300 dark:focus:shadow-outline-gray form-input"
-<<<<<<< HEAD
-                   placeholder="Отчество"
-=======
                    placeholder="Отчество" value="{{ old('surname2') ?? $user->surname2 ?? '' }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             />
             @error('surname2')
             <span class="text-xs text-red-600 dark:text-red-400">
@@ -123,10 +96,7 @@
                         class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                         name="is_worker"
                         value="1"
-<<<<<<< HEAD
-=======
                         <? if ($user->is_worker == 1) echo "checked"; ?>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     />
                     <span class="ml-2">Работник</span>
                 </label>
@@ -135,12 +105,8 @@
                         type="radio"
                         class="text-purple-600 form-radio focus:border-purple-400 focus:outline-none focus:shadow-outline-purple dark:focus:shadow-outline-gray"
                         name="is_worker"
-<<<<<<< HEAD
-                        value="0" checked
-=======
                         value="0"
                     <? if ($user->is_worker == 0) echo "checked"; ?>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     />
                     <span class="ml-2">Работодатель</span>
                 </label>
@@ -149,16 +115,6 @@
 
         <div class="flex flex-col flex-wrap mb-4 space-y-4 md:flex-row md:items-end md:space-x-4">
         <div>
-<<<<<<< HEAD
-            <button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
-                Сохранить
-            </button>
-            <button class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
-                Сменить пароль
-            </button>
-        </div>
-        </div>
-=======
             <button type="submit" class="px-3 py-1 text-sm font-medium leading-5 text-white transition-colors duration-150 bg-purple-600 border border-transparent rounded-md active:bg-purple-600 hover:bg-purple-700 focus:outline-none focus:shadow-outline-purple">
                 Сохранить
             </button>
@@ -169,7 +125,6 @@
         </div>
     </div>
     </form>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         <!--
         <label class="block mt-4 text-sm">
                 <span class="text-gray-700 dark:text-gray-400">
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index 5cda313..79c125e 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -1,19 +1,8 @@
-<<<<<<< HEAD
-@extends('layout.admin', ['title' => 'Админка - Пользователи системы'])
-=======
 @extends('layout.admin', ['title' => $title])
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
 @section('script')
     <script>
         $(document).ready(function() {
-<<<<<<< HEAD
-            $(document).on('click', '.checkban', function () {
-                var this_ = $(this);
-                var value = this_.val();
-                var ajax_block = $('#ajax_block');
-                var bool = 0;
-=======
             $(document).on('click', '.check_click', function () {
                 var this_ = $(this);
                 var value = this_.val();
@@ -21,67 +10,24 @@
                 var ajax_block = $('#ajax_block');
                 var bool = 0;
                 var str_get = '';
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
                 if(this.checked){
                     bool = 1;
                 } else {
                     bool = 0;
                 }
-<<<<<<< HEAD
-=======
                 console.log(field);
                 str_get = "id=" + value + "&" + field + "=" + bool;
                 console.log(str_get);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
                 $.ajax({
                     type: "GET",
                     url: "{{ url()->full()}}",
-<<<<<<< HEAD
-                    data: "id=" + value + "&is_ban=" + bool,
-                    success: function (data) {
-                        console.log('Обновление таблицы пользователей ');
-                        //data = JSON.parse(data);
-                        console.log(data);
-                        ajax_block.html(data);
-                    },
-                    headers: {
-                        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-                    },
-                    error: function (data) {
-                        console.log('Error: ' + data);
-                    }
-                });
-            });
-
-            $(document).on('click', '.checknew', function () {
-                var this_ = $(this);
-                var value = this_.val();
-                var ajax_block = $('#ajax_block');
-                var bool = 0;
-
-                if(this.checked){
-                    bool = 1;
-                } else {
-                    bool = 0;
-                }
-
-                $.ajax({
-                    type: "GET",
-                    url: "{{ url()->full()}}",
-                    data: "id=" + value + "&is_new=" + bool,
-                    success: function (data) {
-                        console.log('Обновление таблицы пользователей ');
-                        //data = JSON.parse(data);
-                        console.log(data);
-=======
                     data: str_get,
                     success: function (data) {
                         console.log('Обновление таблицы пользователей ');
                         //data = JSON.parse(data);
                         //console.log(data);
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         ajax_block.html(data);
                     },
                     headers: {
@@ -96,8 +42,6 @@
     </script>
 @endsection
 
-<<<<<<< HEAD
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
@@ -127,7 +71,6 @@
     </form>
 @endsection
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
         <div class="w-full overflow-x-auto">
@@ -140,16 +83,11 @@
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Email/логин</th>
                     <th class="px-4 py-3">Работодатель/работник/администратор</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Заблокированный</th>
-                    <th class="px-4 py-3">Новый</th>
-=======
                     <th class="px-4 py-3">Бан</th>
                     <th class="px-4 py-3">Новый</th>
                     @if ($id_admin == 1)
                     <th class="px-4 py-3">Админ</th>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <th class="px-4 py-3">Дата регистрации</th>
                 </tr>
                 </thead>
@@ -195,13 +133,6 @@
                         @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                        <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-                    </td>
-                    <td class="px-4 py-3 text-sm">
-                        <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
-                    </td>
-=======
                         @if ($user->id > 1)
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                         @endif
@@ -219,7 +150,6 @@
                         </td>
                     @endif
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <td class="px-4 py-3 text-sm">
                         {{ $user->created_at }}
                     </td>
diff --git a/resources/views/admin/users/index_ajax.blade.php b/resources/views/admin/users/index_ajax.blade.php
index d21363c..a9031f1 100644
--- a/resources/views/admin/users/index_ajax.blade.php
+++ b/resources/views/admin/users/index_ajax.blade.php
@@ -8,16 +8,11 @@
                     <th class="px-4 py-3">Имя</th>
                     <th class="px-4 py-3">Email/логин</th>
                     <th class="px-4 py-3">Работодатель/работник/администратор</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Заблокированный</th>
-                    <th class="px-4 py-3">Новый</th>
-=======
                     <th class="px-4 py-3">Бан</th>
                     <th class="px-4 py-3">Новый</th>
                     @if ($id_admin == 1)
                         <th class="px-4 py-3">Админ</th>
                     @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <th class="px-4 py-3">Дата регистрации</th>
                 </tr>
                 </thead>
@@ -48,13 +43,6 @@
                         @endif
                     </td>
                     <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                        <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-                    </td>
-                    <td class="px-4 py-3 text-sm">
-                        <input type="checkbox" class="checknew" value="{{$user->id}}" name="new_{{$user->id}}" {{ ($user->is_new) ? "checked" : "" }}/>
-                    </td>
-=======
                        @if ($user->id > 1)
                         <input type="checkbox" class="check_click" value="{{$user->id}}" data-field="is_ban" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                        @endif
@@ -71,7 +59,6 @@
                         </td>
                     @endif
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <td class="px-4 py-3 text-sm">
                         {{ $user->created_at }}
                     </td>
diff --git a/resources/views/admin/worker/index.blade.php b/resources/views/admin/worker/index.blade.php
index 5d98d38..3d30e4f 100644
--- a/resources/views/admin/worker/index.blade.php
+++ b/resources/views/admin/worker/index.blade.php
@@ -20,11 +20,7 @@
                     url: "{{ url()->full()}}",
                     data: "id=" + value + "&is_ban=" + bool,
                     success: function (data) {
-<<<<<<< HEAD
-                        console.log('Обновление таблицы пользователей ');
-=======
                         console.log('Обновление таблицы работников ');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         //data = JSON.parse(data);
                         console.log(data);
                         ajax_block.html(data);
@@ -42,10 +38,6 @@
     </script>
 @endsection
 
-<<<<<<< HEAD
-@section('content')
-    <div class="w-full overflow-hidden rounded-lg shadow-xs">
-=======
 @section('search')
     <div class="absolute inset-y-0 flex items-center pl-2">
         <svg
@@ -77,7 +69,6 @@
 
 @section('content')
     <div class="w-full overflow-hidden rounded-lg shadow-xs" id="ajax_block">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
         <div class="w-full overflow-x-auto">
             <table class="w-full whitespace-no-wrap">
                 <thead>
@@ -90,11 +81,7 @@
                     <th class="px-4 py-3">% заполнения анкеты</th>
                     <th class="px-4 py-3">Дата регистрации</th>
                     <th class="px-4 py-3">Изменить</th>
-<<<<<<< HEAD
-                    <th class="px-4 py-3">Блокировать</th>
-=======
                     <th class="px-4 py-3">Бан</th>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </tr>
                 </thead>
                 <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
@@ -137,12 +124,6 @@
                             {{ $user->created_at }}
                         </td>
                         <td class="px-4 py-3 text-sm">
-<<<<<<< HEAD
-                            <a href="">Изменить</a>
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
-=======
                             @if ($user->id > 1)
                                 <a href="{{ route('admin.user-profile', ['user' => $user->id]) }}">Изменить</a>
                             @endif
@@ -151,7 +132,6 @@
                             @if ($user->id > 1)
                                 <input type="checkbox" class="checkban" value="{{$user->id}}" name="ban_{{$user->id}}" {{ ($user->is_ban) ? "checked" : "" }}/>
                             @endif
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </td>
                     </tr>
                 @endforeach
diff --git a/resources/views/admin/worker/index_ajax.blade.php b/resources/views/admin/worker/index_ajax.blade.php
index 41af651..de4bab4 100644
--- a/resources/views/admin/worker/index_ajax.blade.php
+++ b/resources/views/admin/worker/index_ajax.blade.php
@@ -1,179 +1,3 @@
-<<<<<<< HEAD
-@extends('layout.admin', ['title' => 'Админка - Работники'])
-
-@section('content')
-    <div class="w-full overflow-hidden rounded-lg shadow-xs">
-        <div class="w-full overflow-x-auto">
-            <table class="w-full whitespace-no-wrap">
-                <thead>
-                <tr
-                    class="text-xs font-semibold tracking-wide text-left text-gray-500 uppercase border-b dark:border-gray-700 bg-gray-50 dark:text-gray-400 dark:bg-gray-800"
-                >
-                    <th class="px-4 py-3">№</th>
-                    <th class="px-4 py-3">Имя</th>
-                    <th class="px-4 py-3">Email/логин</th>
-                    <th class="px-4 py-3">Работодатель/работник</th>
-                    <th class="px-4 py-3">Дата регистрации</th>
-                </tr>
-                </thead>
-                <tbody class="bg-white divide-y dark:divide-gray-700 dark:bg-gray-800">
-                @foreach($users as $user)
-                    <tr class="text-gray-700 dark:text-gray-400">
-                        <td class="px-4 py-3">
-                            {{$user->id}}
-                        </td>
-                        <td class="px-4 py-3">
-                        <!--<div class="flex items-center text-sm">
-                            <div class="relative hidden w-8 h-8 mr-3 rounded-full md:block">
-                                <div
-                                    class="absolute inset-0 rounded-full shadow-inner"
-                                    aria-hidden="true"
-                                ></div>
-                            </div>
-                            <div>
-                                <p class="font-semibold"><a href="{{ route('admin.users') }}">Пользователи</a></p>
-                                <p class="text-xs text-gray-600 dark:text-gray-400">
-                                    Все пользователи сайта
-                                </p>
-                            </div>
-                        </div>
-                        -->
-                            {{ $user->name }}
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            {{ $user->email }}
-                        </td>
-                        <td class="px-4 py-3 text-xs">
-                        <span class="px-2 py-1 font-semibold leading-tight text-green-700 bg-green-100 rounded-full dark:bg-green-700 dark:text-green-100">
-                          @if ($user->is_worker)
-                                Работник
-                            @else
-                                Работодатель
-                            @endif
-                        </span>
-                            @if ($user->admin)
-                                <span class="px-2 py-1 font-semibold leading-tight text-orange-700 bg-orange-100 rounded-full dark:text-white dark:bg-orange-600">
-                           Администратор
-                        </span>
-                            @endif
-                        </td>
-                        <td class="px-4 py-3 text-sm">
-                            {{ $user->created_at }}
-                        </td>
-                    </tr>
-                @endforeach
-                </tbody>
-            </table>
-        </div>
-
-        <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
-            <?=$users->appends($_GET)->links('admin.pagginate'); ?>
-        </div>
-
-
-        <!--<div
-            class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800"
-        >
-                <span class="flex items-center col-span-3">
-                  Showing 21-30 of 100
-                </span>
-            <span class="col-span-2"></span>
-
-            <span class="flex col-span-4 mt-2 sm:mt-auto sm:justify-end">
-                  <nav aria-label="Table navigation">
-                    <ul class="inline-flex items-center">
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md rounded-l-lg focus:outline-none focus:shadow-outline-purple"
-                            aria-label="Previous"
-                        >
-                          <svg
-                              aria-hidden="true"
-                              class="w-4 h-4 fill-current"
-                              viewBox="0 0 20 20"
-                          >
-                            <path
-                                d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z"
-                                clip-rule="evenodd"
-                                fill-rule="evenodd"
-                            ></path>
-                          </svg>
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          1
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          2
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 text-white transition-colors duration-150 bg-purple-600 border border-r-0 border-purple-600 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          3
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          4
-                        </button>
-                      </li>
-                      <li>
-                        <span class="px-3 py-1">...</span>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          8
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md focus:outline-none focus:shadow-outline-purple"
-                        >
-                          9
-                        </button>
-                      </li>
-                      <li>
-                        <button
-                            class="px-3 py-1 rounded-md rounded-r-lg focus:outline-none focus:shadow-outline-purple"
-                            aria-label="Next"
-                        >
-                          <svg
-                              class="w-4 h-4 fill-current"
-                              aria-hidden="true"
-                              viewBox="0 0 20 20"
-                          >
-                            <path
-                                d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z"
-                                clip-rule="evenodd"
-                                fill-rule="evenodd"
-                            ></path>
-                          </svg>
-                        </button>
-                      </li>
-                    </ul>
-                  </nav>
-                </span>
-        </div>-->
-    </div>
-
-    <?//=$users->appends($_GET)->links('catalogs.paginate'); ?>
-
-
-@endsection
-=======
 <div class="w-full overflow-x-auto">
     <table class="w-full whitespace-no-wrap">
         <thead>
@@ -247,4 +71,3 @@
 <div class="grid px-4 py-3 text-xs font-semibold tracking-wide text-gray-500 uppercase border-t dark:border-gray-700 bg-gray-50 sm:grid-cols-9 dark:text-gray-400 dark:bg-gray-800">
     <?=$users->appends($_GET)->links('admin.pagginate'); ?>
 </div>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
diff --git a/resources/views/layout/admin.blade.php b/resources/views/layout/admin.blade.php
index 6262d1b..40d0f23 100644
--- a/resources/views/layout/admin.blade.php
+++ b/resources/views/layout/admin.blade.php
@@ -27,15 +27,8 @@
         class="z-20 hidden w-64 overflow-y-auto bg-white dark:bg-gray-800 md:block flex-shrink-0"
     >
         <div class="py-4 text-gray-500 dark:text-gray-400">
-<<<<<<< HEAD
-            <a
-                class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
-                href="{{ route('admin.index') }}"
-            >
-=======
             <a class="ml-6 text-lg font-bold text-gray-800 dark:text-gray-200"
                 href="{{ route('admin.index') }}">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 Админка
             </a>
             <ul class="mt-6">
@@ -156,18 +149,11 @@
                         <span class="ml-4">Вакансии</span>
                     </a>
                 </li>
-<<<<<<< HEAD
-                <li class="relative px-6 py-3">
-                    <a
-                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                        href="{{ route('admin.categories') }}"
-=======
 
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.messages') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -179,27 +165,15 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Категории</span>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.job-titles') }}"
-=======
                         href="{{ route('admin.groups') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -211,11 +185,6 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Должности</span>
-=======
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
@@ -241,17 +210,12 @@
                             ></path>
                         </svg>
                         <span class="ml-4">Роли пользователей</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.messages') }}"
-=======
                         href="{{ route('admin.statics') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -263,28 +227,18 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Сообщения</span>
-=======
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
                             <path d="M20.488 9H15V3.512A9.025 9.025 0 0120.488 9z"></path>
                         </svg>
                         <span class="ml-4">Статистика</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.groups') }}"
-=======
                         href="{{ route('admin.answers') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -296,15 +250,6 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Группы пользователей</span>
-                    </a>
-                </li>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Модерация</span>
@@ -372,17 +317,11 @@
 
 
                 <!-- Редактор -->
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <li class="relative px-6 py-3">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         @click="togglePagesMenu"
-<<<<<<< HEAD
-                        aria-haspopup="true"
-                    >
-=======
                         aria-haspopup="true">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <span class="inline-flex items-center">
                   <svg
                       class="w-5 h-5"
@@ -392,21 +331,12 @@
                       stroke-linejoin="round"
                       stroke-width="2"
                       viewBox="0 0 24 24"
-<<<<<<< HEAD
-                      stroke="currentColor"
-                  >
-=======
                       stroke="currentColor">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     <path
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
-<<<<<<< HEAD
-                  <span class="ml-4">Страницы</span>
-=======
                   <span class="ml-4">Редактор</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </span>
                         <svg
                             class="w-4 h-4"
@@ -432,36 +362,6 @@
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
-<<<<<<< HEAD
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/login.html">Login</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/create-account.html">
-                                    Create account
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/forgot-password.html">
-                                    Forgot password
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/404.html">404</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/blank.html">Blank</a>
-=======
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
                             </li>
@@ -482,15 +382,11 @@
                             </li>
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                             </li>
                         </ul>
                     </template>
                 </li>
-<<<<<<< HEAD
-=======
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
             </ul>
             <!--<div class="px-6 my-6">
                 <button
@@ -652,11 +548,7 @@
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.categories') }}"
-=======
                         href="{{ route('admin.messages') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -668,20 +560,6 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M8 16H6a2 2 0 01-2-2V6a2 2 0 012-2h8a2 2 0 012 2v2m-6 12h8a2 2 0 002-2v-8a2 2 0 00-2-2h-8a2 2 0 00-2 2v8a2 2 0 002 2z"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Категории</span>
-                    </a>
-                </li>
-                <li class="relative px-6 py-3">
-                    <a
-                        class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                        href="{{ route('admin.job-titles') }}"
-                    >
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
@@ -710,7 +588,6 @@
                 <li class="relative px-6 py-3">
                     <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                        href="{{ route('admin.roles') }}">
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
@@ -721,27 +598,17 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Должности</span>
-=======
                             <path
                                 d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
                             ></path>
                         </svg>
                         <span class="ml-4">Роли пользователей</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </a>
                 </li>
                 <li class="relative px-6 py-3">
                     <a
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-<<<<<<< HEAD
-                        href="{{ route('admin.messages') }}"
-=======
                         href="{{ route('admin.statics') }}"
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     >
                         <svg
                             class="w-5 h-5"
@@ -753,16 +620,6 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
-                        </svg>
-                        <span class="ml-4">Сообщения</span>
-                    </a>
-                </li>
-                <li class="relative px-6 py-3">
-                    <a class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                       href="{{ route('admin.groups') }}">
-=======
                             <path
                                 d="M11 3.055A9.001 9.001 0 1020.945 13H11V3.055z"
                             ></path>
@@ -776,7 +633,6 @@
                         class="inline-flex items-center w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
                         href="{{ route('admin.messages') }}"
                     >
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         <svg
                             class="w-5 h-5"
                             aria-hidden="true"
@@ -787,15 +643,6 @@
                             viewBox="0 0 24 24"
                             stroke="currentColor"
                         >
-<<<<<<< HEAD
-                            <path
-                                d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01"
-                            ></path>
-                        </svg>
-                        <span class="ml-4">Группы пользователей</span>
-                    </a>
-                </li>
-=======
                             <path d="M4 6h16M4 10h16M4 14h16M4 18h16"></path>
                         </svg>
                         <span class="ml-4">Сообщения</span>
@@ -863,7 +710,6 @@
 
 
                 <!-- Редактор -->
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 <li class="relative px-6 py-3">
                     <button
                         class="inline-flex items-center justify-between w-full text-sm font-semibold transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
@@ -885,11 +731,7 @@
                         d="M4 5a1 1 0 011-1h14a1 1 0 011 1v2a1 1 0 01-1 1H5a1 1 0 01-1-1V5zM4 13a1 1 0 011-1h6a1 1 0 011 1v6a1 1 0 01-1 1H5a1 1 0 01-1-1v-6zM16 13a1 1 0 011-1h2a1 1 0 011 1v6a1 1 0 01-1 1h-2a1 1 0 01-1-1v-6z"
                     ></path>
                   </svg>
-<<<<<<< HEAD
-                  <span class="ml-4">Страницы</span>
-=======
                   <span class="ml-4">Редактор</span>
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                 </span>
                         <svg
                             class="w-4 h-4"
@@ -915,37 +757,6 @@
                             class="p-2 mt-2 space-y-2 overflow-hidden text-sm font-medium text-gray-500 rounded-md shadow-inner bg-gray-50 dark:text-gray-400 dark:bg-gray-900"
                             aria-label="submenu"
                         >
-<<<<<<< HEAD
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/login.html">Login</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/create-account.html">
-                                    Create account
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/forgot-password.html">
-                                    Forgot password
-                                </a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/404.html">404</a>
-                            </li>
-                            <li
-                                class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200"
-                            >
-                                <a class="w-full" href="pages/blank.html">Blank</a>
-                            </li>
-=======
                             <li class="px-2 py-1 transition-colors duration-150 hover:text-gray-800 dark:hover:text-gray-200">
                                 <a class="w-full" href="{{ route('admin.editor-site') }}">Редактор сайта</a>
                             </li>
@@ -968,7 +779,6 @@
                                 <a class="w-full" href="{{ route('admin.employers-main') }}">Работодатели на главной</a>
                             </li>
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                         </ul>
                     </template>
                 </li>
@@ -1010,31 +820,8 @@
                     <div
                         class="relative w-full max-w-xl mr-6 focus-within:text-purple-500"
                     >
-<<<<<<< HEAD
-                        <div class="absolute inset-y-0 flex items-center pl-2">
-                            <svg
-                                class="w-4 h-4"
-                                aria-hidden="true"
-                                fill="currentColor"
-                                viewBox="0 0 20 20"
-                            >
-                                <path
-                                    fill-rule="evenodd"
-                                    d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
-                                    clip-rule="evenodd"
-                                ></path>
-                            </svg>
-                        </div>
-                        <input
-                            class="w-full pl-8 pr-2 text-sm text-gray-700 placeholder-gray-600 bg-gray-100 border-0 rounded-md dark:placeholder-gray-500 dark:focus:shadow-outline-gray dark:focus:placeholder-gray-600 dark:bg-gray-700 dark:text-gray-200 focus:placeholder-gray-500 focus:bg-white focus:border-purple-300 focus:outline-none focus:shadow-outline-purple form-input"
-                            type="text"
-                            placeholder="Искать..."
-                            aria-label="Search"
-                        />
-=======
 
                         @yield('search')
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                     </div>
                 </div>
                 <ul class="flex items-center flex-shrink-0 space-x-6">
@@ -1257,8 +1044,6 @@
                     <span>Список админов &RightArrow;</span>
                 </a>
 
-<<<<<<< HEAD
-=======
                 @if ($message = Session::get('success'))
                     <section>
                         <div class="alert alert-success alert-dismissible mt-0" role="alert">
@@ -1285,7 +1070,6 @@
                     </section>
               @endif
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
                @yield('content')
 
                 <!-- Cards
diff --git a/routes/web.php b/routes/web.php
index 93ba7a8..7dd4198 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,35 +1,25 @@
 <?php
 
 use App\Http\Controllers\Admin\AdminController;
-<<<<<<< HEAD
-use App\Http\Controllers\Admin\EmployersController;
-=======
 use App\Http\Controllers\Admin\CategoryController;
 use App\Http\Controllers\Admin\EmployersController;
 use App\Http\Controllers\Admin\InfoBloksController;
 use App\Http\Controllers\Admin\JobTitlesController;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use App\Http\Controllers\Admin\UsersController;
 use App\Http\Controllers\Admin\WorkersController;
 use App\Http\Controllers\Auth\LoginController;
 use App\Http\Controllers\Auth\RegisterController;
-<<<<<<< HEAD
-=======
 use App\Http\Controllers\CKEditorController;
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 use App\Models\User;
 use App\Http\Controllers\MainController;
 use App\Http\Controllers\HomeController;
 use Illuminate\Support\Facades\Route;
-<<<<<<< HEAD
-=======
 use App\Http\Controllers\Admin\CompanyController;
 use App\Http\Controllers\Admin\Ad_EmployersController;
 use App\Http\Controllers\Admin\MsgAnswersController;
 use App\Http\Controllers\Admin\GroupsController;
 use App\Http\Controllers\PagesController;
 
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
 /*
 |--------------------------------------------------------------------------
@@ -94,13 +84,6 @@ Route::group([
 
     // кабинет главная страница
     Route::get('cabinet', [AdminController::class, 'index'])->name('index');
-<<<<<<< HEAD
-    // кабинет профиль
-    Route::get('profile', [AdminController::class, 'profile'])->name('profile');
-    // кабинет настройки
-    Route::get('config', [AdminController::class, 'config'])->name('config');
-
-=======
 
     // кабинет профиль админа - форма
     Route::get('profile', [AdminController::class, 'profile'])->name('profile');
@@ -130,7 +113,6 @@ Route::group([
     Route::get('config', [AdminController::class, 'config_form'])->name('config');
     // кабинет настройки сайта сохранение формы
     Route::post('config', [AdminController::class, 'store_config'])->name('store_config');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
 
     // кабинет - пользователи
     Route::get('users', [UsersController::class, 'index'])->name('users');
@@ -145,25 +127,6 @@ Route::group([
     Route::get('workers', [WorkersController::class, 'index'])->name('workers');
 
     // кабинет - вакансии
-<<<<<<< HEAD
-    Route::get('ad-employers', [AdminController::class, 'index'])->name('ad-employers');
-
-    // кабинет - категории
-    Route::get('categories', [AdminController::class, 'index'])->name('categories');
-
-    // кабинет - должности
-    Route::get('job-titles', [AdminController::class, 'index'])->name('job-titles');
-
-    // кабинет - сообщения
-    Route::get('messages', [AdminController::class, 'index'])->name('messages');
-
-    // кабинет - группы пользователей
-    Route::get('groups', [AdminController::class, 'index'])->name('groups');
-
-    // кабинет - список админов
-    Route::get('group-admin', [AdminController::class, 'index'])->name('group-admin');
-});
-=======
     Route::get('ad-employers', [Ad_EmployersController::class, 'index'])->name('ad-employers');
 
     // кабинет - категории
@@ -273,4 +236,3 @@ Route::group([
 Route::post('ckeditor/upload', [CKEditorController::class, 'upload'])->name('ckeditor.image-upload');
 
 Route::get('pages/{pages:slug}', [PagesController::class, 'pages'])->name('page');
->>>>>>> 5b2dcf44bcbc4104982dafd29e39da7190924e3b
diff --git a/storage/app/.gitignore b/storage/app/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/app/public/.gitignore b/storage/app/public/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/cache/data/.gitignore b/storage/framework/cache/data/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/testing/.gitignore b/storage/framework/testing/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore
old mode 100644
new mode 100755
diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore
old mode 100644
new mode 100755