Use non conflict examples
Merge pull request #2 from Petah/patch-2

Use non conflict examples