deal with confilct