resolve confilct