Our VersionConflict handling could result in an UnpackError when rendering

See #212 

Fixes #212 

Includes test (that indeed failed initially). Includes fix (of course) and a changelog entry (hurray!).
I fixed it a bit. My emacs was a bit too enthousistic.

Didn't fix the indent, see the next comment.