fix token generation
merge conficts