put markers in vimrc and reorganize
merge origin master
g stash merge
merge master
g stash merge