corregir merges #68

Closed Daniel-C96 closed 6 months ago