Fix merge conflict in registrations_controller