confict tet
confict sovled