Fix diagnostic conflict