nokogiri issues
fixed conflicts