Update Composer to remove conflict