merge from the original