Delete conflicts