fix layout
merge