updated info
merge