change from evaluation of abnormal measurement types to use normal measurement types. if not normal, then don't combine
fix merge conflicts