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

database/migrations/2020_12_15_185412_create_chat_links_table.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateChatLinksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('chat_links', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('link');
+            $table->unsignedInteger('class_id');
+            $table->unsignedInteger('creator');
+            $table->timestamps();
+
+            $table->foreign('class_id')
+                ->references('id')->on('school_classes')
+                ->onDelete('cascade');
+            $table->foreign('creator')
+                ->references('id')->on('users')
+                ->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('chat_links');
+    }
+}