Session08

More merge conflict markers here.  Fix please.