Re-solve upgrade conflicts.
Increase solved counter in the upgrade job.