fix derp in heads up and CM privacy guard merge