fix bad merge


git-svn-id: https://svn.apache.org/repos/asf/incubator/npanday/trunk@1451864 13f79535-47bb-0310-9956-ffa450edef68