fix conflict

core/migrations/0002_auto_20191208_0023.py

+# Generated by Django 2.2.8 on 2019-12-07 17:23
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='feedback',
+            name='companyId',
+        ),
+        migrations.AddField(
+            model_name='feedback',
+            name='vacancyId',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Vacancy'),
+        ),
+        migrations.AlterField(
+            model_name='student',
+            name='github_url',
+            field=models.URLField(blank=True, null=True, validators=[django.core.validators.RegexValidator('github.com')]),
+        ),
+        migrations.AlterField(
+            model_name='student',
+            name='gitlab_url',
+            field=models.URLField(blank=True, null=True, validators=[django.core.validators.RegexValidator('gitlab.com')]),
+        ),
+    ]

core/models/feedbacks.py

 from django.db import models
-from core.models.accounts import Student, Company
+from core.models.accounts import Student
+from core.models.vacancies import Vacancy
 
 
 class Feedback(models.Model):
@@ -7,7 +8,7 @@ class Feedback(models.Model):
     title = models.CharField(max_length=100, blank=True, default='')
     content = models.TextField()
     studentId = models.ForeignKey(Student, on_delete=models.CASCADE, null=True)
-    companyId = models.ForeignKey(Company, on_delete=models.CASCADE, null=True)
+    vacancyId = models.ForeignKey(Vacancy, on_delete=models.CASCADE, null=True)
 
     class Meta:
         ordering = ['created']