Fixed gemfile.lock conflicts