rm merge conflict in schema.rb