fix for metadata fetch
merge from remote
merge from remote