conflid resolved