merging conflit resolving
ajustes
working with entitymanager
arquivo md
test
commit
commit