Resolving conflict for removed submodule fixed