How are merge conflicts handled? If you look at issue 7542 <https://pharo.fogbugz.com/default.asp?7542> there is a merge conflict with the current version and SLICE-Issue-7542-NB-system-example-IgorStasenko.2 The current version usess Smalltalk compiler new ... and igors version uses Smalltalk compiler ...
Smalltalk compiler new doesn't work, as Smalltalk compiler is alread an instance of OpalCompiler nicolai
