conflicts solved in Gemfile.lock