Updated conflict errors