Re-process Gemfile.lock after last merge.