UnifiedBuild.asciidoc: fix merge error