fix conflict
Merge branch 'staging' of https://github.com/timhub/EnglishMagnet into staging