Resolve org (35/48)

Resolve org