Remove submodule conflict.