Resolve upgrade conflicts.