Fix typo in noConflict section
Merge pull request #1714 from snkashis/patch-2

Fix typo in noConflict section