Missed some conflict markers, re-gened schema.rb with db:reset.