I get a merge problem (3 conflicts) when updating from a Pharo-20486.image:

KeyChain-StephaneDucasse.29