refactor: Use [conflict_class] in simplified rep (#11369)

refactor: Use [conflict_class] in simplified rep (#11369) #2810