[ticket/12489] Resolve conflict

PHPBB3-12489