Merge .resolve and .resolveChain into one method