adds some stuff, edit asset is in progress
fixes conflicts