# Conflicts: # config/routes.rb # db/schema.rb # enterprise/app/models/enterprise/concerns/message.rb