Fix merge error

hyrax/app/models/crc_dataset.rb

@@ -13,8 +13,7 @@ class CrcDataset < ActiveFedora::Base
   validates :title, presence: { message: 'Your CRC dataset must have a title.' }
   validate :validate_parent_collection
   after_save :save_work_meta_json_file_to_s3, :handle_meta_file_on_s3
-  after_create :set_default_source_and_tombstone_status, :set_default_values
-  after_create :register_ark
+  after_create :set_default_source_and_tombstone_status, :set_default_values, :register_ark
 
   # ------ properties from core metadata ------
   # property date_modified          - not displayed (filled in by the system)

hyrax/config/locales/en.yml

@@ -95,6 +95,7 @@ en:
           blank: "Modality title can't be blank"
           uniqueness: "Folder name (%{value}) obtained from modality title is already taken."
           length: "The modality title should be between 3-63 characters long. Consider using leading zeros (e.g. 003 instead of 3)"
+      uploads:
         file_not_allowed: "This file name is restricted. Delete this file and upload again after changing the name"
   simple_form:
     hints: