Fix strings after merged