Add Haml specifics
Add Error and htmlError
Mergeconflict