fixing conflit
fixing conflit
Merge branch 'fix' of https://github.com/thiagorpp/viamundi into fix