new updates
merge
remove module
update vimrc