Always delete all conflicts