Add resolve submodule conflict dialog