trying to resolve composer.lock conflicts