cleanup — use indicator.checkCanceled
resolve merge conflicts — correctly compute merge data (we must use dir cache)
resolve merge conflicts — implement conflictResolvedForFile