remove target
resolve conflict