the merge tool in #pharo is really nice