fix submodule conflict