update metadata and layout
merging origin development