haml and bug squash
merge