John Smith
john@example.com
Fixes #6749
* Invalidate nightly bucket files after publish * Fix conflict resolution