Conflict resolution, rebasing, and organizational strategies

(40 min demo and discussion)