commit gitmodules
resolve merge conflict of gitmodules
rm goldenview vim-python-pep8-indent submodule