Handle conflicts by WCs directly.
Add patch.