Modified composer.lock
Merged