Add tree control
Commit Change
Resolve Conflicts
Commit merge