fix the token conflict bugs