Revert "Don't waste iterations in resolving Bundler, just use the current version"

This reverts commit d672064dbd3ea69144d43f66cbf0b6a926fbe0a9.
On conflict, try traversing the dependency tree differently