merge from ori