supplies added
composer.lock
composer.lock updated
manage usersolved conflict