second merge (zh and yym is ok, no push and pull)