Add haml mode
Resolve confrict