remove conflicting token