Removed more merge conflicts in Gemfile.lock.