Merge pull request #3 from evildmp/master

merging with upstream
Removed typo
Merge pull request #89 from davideire/ammend-conflict-pa

Fixed typo in conflicts.rst