schema rollback
migrate fix rolled back
fix merge conflict in db/schema.rb
minor visual tweaks