Fixed second merge conflict in Gemfile.lock