conflicts deleted