Resolve confilct