upgrade rails
merge conflicts