conflict A and B
confilct test A & B
confict solved