[feature/session-storage] Fix merge code duplication conflicts

PHPBB3-9733