added metadata
fixed confilct