resolvendo conflitos da main volta de commit #72

Closed Igorggwp closed 1 month ago