Updated composer.lock
Merge conflict