Episode notes

In which there is a conflict, and a resolution. Of sorts.