fixed gemfile.lock conflicts