update layout
merge