code merge
meta data function added
conflict resolve