Resolve merge errors

app/models/version/keyrelay_version.rb

@@ -1,5 +0,0 @@
-class KeyrelayVersion < PaperTrail::Version
-  include VersionSession
-  self.table_name    = :log_keyrelays
-  self.sequence_name = :log_keyrelays_id_seq
-end

app/models/version/payment_order_version.rb

@@ -0,0 +1,4 @@
+class PaymentOrderVersion < PaperTrail::Version
+  self.table_name    = :log_payment_orders
+  self.sequence_name = :log_payment_orders_id_seq
+end

app/models/version/registrant_verification_version.rb

@@ -0,0 +1,7 @@
+class RegistrantVerificationVersion < PaperTrail::Version
+  include VersionSession
+  self.table_name    = :log_registrant_verifications
+  self.sequence_name = :log_registrant_verifications_id_seq
+
+  scope :deleted, -> { where(event: 'destroy') }
+end

app/models/version/setting_entry_version.rb

@@ -0,0 +1,4 @@
+class SettingEntryVersion < PaperTrail::Version
+  self.table_name    = :log_setting_entries
+  self.sequence_name = :log_setting_entries
+end