FormResolveConflicts show submodule hashes for merge conflicts