added two more questions about undoing a merge and going back to a
previous commit.