Conflict resolution by @GwilymBarista