Code

Submodules: Don't parse .gitmodules when it contains, merge conflicts