Change wording
Better text for vclock conflicts
Merge branch 'michel_1028_auth_key' into next