conflict in Gemfile.lock sovled