update to conformal master