general update
merge design