new composer.lock
merged