attach_metadata
merge conflcit