Comment by sli

Merge conflicts are handled transparently and seemingly indeterminately? Yikes.