delete conflit