delete those conflicts