new protect
resolve conflict