conflict before package split