Get rid of a merge conflict.
Get rid of a merge conflict.

dg1dd1ngs/haml,haml/haml,tangposmarvin/haml,haml/haml,macressler/haml,dg1dd1ngs/haml,stanhu/haml,haml/haml,tangposmarvin/haml,amatsuda/haml,sideci-sample/sideci-sample-haml,nazar-pc/haml,nazar-pc/haml,stanhu/haml,concord-consortium/haml,keithpitty/haml,haml/haml,uniba/hamldoc_ja,keithpitty/haml,macressler/haml