modify layout
merge with remote