Deleted conflicts