conflict solved in gemfile.lock