Patch to package conflicts.