Update gems.
Pull gemset changes, resolve merging conflict.