Conflicted submodule hashes added to FormResolveConflicts