Figuring out diff and merge
Still don't know how to work vimdiff.