Merge branch 'rs/unpack-trees-tree-walk-conflict-field'