Packages from the vendor pingiun

pingiun/fix-composer-conflicts