corrected merge errors in index.html.haml and workspace.xml files