add merge vs. rebase illustrations
fix some list HTML markup errors