add meta data
fixed merge issues