new
resolve conflict