merge from seajs