updated
conflict resolved in todo.html.haml