update dist
merge