[Conflict] Add requirement trees and the locked requirement

To allow for bundler-style conflict messages