Optimize resolving submodule conflict process