Tokens - fix after rebase, git do not detect conflict