resolve merge conflict in schema.rb