[Conflict GIT] resolve submodule parser