merge from qiye