Merge error
Merge pull request #246 from Wikia/fix-suggestions

Merge error