Update Rails and gems.
Add the untracked files.
Merge files.