Merge from original source