package manifest conflicts resolved