deploy: resolve possible merge conflicts in Gemfile.lock