Switch to unified view

a/src/conftree.h b/src/conftree.h