* STATUS: Explain how to resolve the merge conflict.
    While here, add a spelling fix to the r1480080 group.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.8.x@1482459 13f79535-47bb-0310-9956-ffa450edef68