merge from Chi