[ticket/13234] Fix merge conflict

PHPBB3-13234