[ticket/10073] Remove language string from rebase conflict

PHPBB3-10073