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!).
Agreed that indentation looks nicer, but this way it matches the ugly style of the rest of the file.

Local consistency...