.gitignore and .viminfo
.gitignore and .viminfo
fixing merge conflict