Alexander Belanger a1956e9782 fix merge conflicts %!s(int64=4) %!d(string=hai) anos
..
token.go a1956e9782 fix merge conflicts %!s(int64=4) %!d(string=hai) anos
token_test.go 26c7559c06 get tests to work again %!s(int64=4) %!d(string=hai) anos