[Pharo-users] How to handle conflict resolution in baselines?