Torsten I took the 20486 from the ci server and did an update and I got no problem at all. So I have no idea from where the problem is coming. Stef On Jan 26, 2013, at 12:25 PM, Torsten Bergmann wrote:

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

KeyChain-StephaneDucasse.29