Resolving merge conflicts in schema.rb