Updated Yi to use Diff 3.0