Conflicts
Merge pull request #18 from mpath/conflictor

Conflicts