App ok, resolvido conflitos de submodules