update nokogiri
merge