fixed merge conflicts in schema.rb