Gavin_

+1 For a diff view on conflicts. Poring through large notes with conflicts is so extremely tedious as to make the conflict feature almost pointless for such notes. It leaves me searching for needles in haystacks, and always worried that I've missed some. No good at all.