Huggle:Revert-conflict/en

The page was edited by the whitelisted user '$1'