one version
through vimdiff handle conflict merge
Merge pull request #1 from differentialmanifold/iss200

Iss200