Best way to handle sub-package conflicts