Fixing code conflicts on i18n files