Trying to fi gemfile.lock conflict