prototype update
merge