Merge with Pharo