change from original
merge