Resolve org (22/48)

Resolve org