[Pharo-project] [ANN] Fix merge + Pop Up cleaning