Resolve org (21/48)

Resolve org