Sample: resolver reorg