Resolve org (36/48)

Resolve org