Fix conflicting message typo
Merge pull request #139 from sbesson/conflict_typo

Fix conflicting message typo