Could not show submodule conflicts in TortoiseMerge, now can show the BASE, LOCAL...