Inyoung d8bdc14335 Fixing merge conflict %!s(int64=7) %!d(string=hai) anos
..
app.cpython-35.pyc d8bdc14335 Fixing merge conflict %!s(int64=7) %!d(string=hai) anos