Resloving one conflict