Cleanup conflict post upgrade.