upgrade formatter
resolve conflict