add approved to media
Resolve cconflicts