fixed Gemfile and Gemfile.lock
fixed Gemfile.lock
merge it