Some merge conflict text accidentally got into javadoc, fixed.