handle gauges and counters
fix merge conflict