tt add
Merge branch 'master' of https://github.com/yaasita/myvimrc
a
Conflicts:
	plugin/myvimrc.vim