Remove submodule CVSconflict