Fix automatic conflict resolver not resolving to the root package version.