in Status

Resolve composer.lock conflicts with composer update --lock