[Pharo-project] Problem with merging, changes and MC