[Pharo-project] Mickael system submission Slice merging problem

Hi mike could you redo you system organization changes? I checked with lukas we get a problem with the two merging tools :). Else what I can do is to keep track of the conflicts by hand (only a few) and load then revert. Because apparently MC does let me merge directly your changes. I can try to do the managing of your changes in late afternoon today. After I really want to work on the closures (but I have some important administration to do by tomorrow). Stef