Update writeup.
Resolve merge conflicts.