added line in whatsup.rb for conflict