update Gemfile.lock for resolving Gemfile conflict