Fix doc name for conflict.
Merge pull request #2 from samth/master

Fix doc name for conflict. Thx!