Gemfile.lock merge=bundlelock
db/schema.rb merge=railsschema
