Update druida.rb
fix conflicts in iris/master: druida.rb