fix: merge conflicts

Author: andrestejerina97

config/audit_log.php

@@ -292,5 +292,13 @@
             'enabled' => true,
             'strategy' => \App\Audit\ConcreteFormatters\SummitSponsorExtraQuestionTypeAuditLogFormatter::class,
         ],
+        \models\summit\Sponsor::class => [
+            'enabled' => true,
+            'strategy' => \App\Audit\ConcreteFormatters\SponsorAuditLogFormatter::class,
+        ],
+        \models\summit\SummitEventType::class => [
+            'enabled' => true,
+            'strategy' => \App\Audit\ConcreteFormatters\SummitEventTypeAuditLogFormatter::class,
+        ],
     ]
 ];