Fix merge issues

src/registrar/migrations/0021_alter_contact_first_name_alter_contact_last_name_and_more.py

@@ -1,44 +0,0 @@
-# Generated by Django 4.2 on 2023-05-22 17:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("registrar", "0020_remove_domaininformation_security_email"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="contact",
-            name="first_name",
-            field=models.TextField(
-                blank=True,
-                db_index=True,
-                help_text="First name",
-                null=True,
-                verbose_name="first name / given name",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="contact",
-            name="last_name",
-            field=models.TextField(
-                blank=True,
-                db_index=True,
-                help_text="Last name",
-                null=True,
-                verbose_name="last name / family name",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="contact",
-            name="title",
-            field=models.TextField(
-                blank=True,
-                help_text="Title",
-                null=True,
-                verbose_name="title or role in your organization",
-            ),
-        ),
-    ]

src/registrar/tests/test_views.py

@@ -1312,6 +1312,8 @@ class TestDomainDetail(TestWithDomainPermissions, WebTest):
         self.domain_information.save()
         page = self.app.get(
             reverse("domain-authorizing-official", kwargs={"pk": self.domain.id})
+        )
+        self.assertContains(page, "Testy")
 
     def test_domain_your_contact_information(self):
         """Can load domain's your contact information page."""