[Pharo-project] Merge tool bug?