Updated conflict