Conflicts: app/controllers/experiments_controller.rb app/controllers/my_modules_controller.rb db/schema.rb