merge in ep 04

Conflicts:
drafts/03/03-panic.md