Fixed conflict residual content from i18n.csv