Fix merge conflict
Fix merge conflict

Luceos/flarum-french,Yggdrasil-dono/flarum,L33tSheep/flarum,milescellar/flarum-ext-french,milescellar/flarum-ext-french,L33tSheep/flarum,milescellar/flarum-ext-french,Luceos/flarum-french,Yggdrasil-dono/flarum