Add new Gemfile.lock to resolve conflict between master and p2 branches