As part of moving tree conflict information storage to the victim nodes, I'll be bumping the format to f21 shortly. It is pretty unobtrusive, and the upgrade code and test has already been committed in r1034155. The upgrade should be painless for folks, but I figured I'd just give fair warning.
If nobody has concerns, I'll do the bump tomorrow. -Hyrum
