* Improve resolver * Improve handling of environment markers * Update lock file * Fix recursion error on duplicate dependencies with only different extras
