gauge improvement
resolve conflict