Undoing Hennessy
fixing merge conflict