Make two conflicts , Add a class