[Bug 293401] Update from 10.2 to 10.3 Alpha 6 - conflicts/resolverTestcase