fix make up
Merge branch 'hotfix/fix_haml'

* hotfix/fix_haml:
  fix make up