fix problems configuration
fix conflict
Merge branch 'master' of https://github.com/leandrorramos/ondeCompro