Conflicts: app/views/layouts/new_base_user.html.erb
Conflicts: db/schema.rb
Conflicts: app/controllers/organizations_controller.rb