update rails
merge changes