Upgrade Rails and merge sites