Conflicted submodule hashes added to FormResolveConflicts
Checkout branch is merge submodule dialog fixed