Filter to tree
merge resolve