tree changes
merge resolve
bit changes