ignore db/schema.rb and delete
merge design