Revert "desfazendo resolvendo conflito do makefile"

This reverts commit e201b8f3930719fa78ca8b4bead5c5dbd767d77c.