conflicts remove db/schema.rb