changed graphite metric name
fix merge conflict