update composer.lock, old one had conflicts