Resolve org (9/48)

Resolve org