Switch to HAML over ERB
Fix merge conflcits