Fixed gemfile.lock merge conflicts