Feature #2368 - fixing conflicts and merging new strings