updated es and zh
fixing conflicts