cleaning up merge problems in db/schema.rb