Changes from document
resolve conflicts common.html.haml