Waldemar Brodkorb 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos
..
patches 8207b8d446 another round of updates and musl fixes %!s(int64=11) %!d(string=hai) anos
Makefile 05d715df3a resolve merge conflict %!s(int64=10) %!d(string=hai) anos