merging in rails upgrade