Re: Fixing a multi-master divergence