Resolve merge conflit in Gemfile.lock.