Merge conflicts and section editing

[dellsystem]

When encountering a merge conflict while performing sectional editing, you'll get a confusing diff.

Solution: Not sure. Switch to full-document editing when a merge conflict is encountered? Or just show the part of the conflict that is relevant to the section? (What happens if the section is removed entirely??)