* STATUS: Note merge conflict

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