Rename manual for conflict.
Merge pull request #1 from samth/master

Rename manual for conflict.