Waldemar Brodkorb d18bf49e2a merge conflict, update hash %!s(int64=10) %!d(string=hai) anos
..
Makefile d18bf49e2a merge conflict, update hash %!s(int64=10) %!d(string=hai) anos