Resolve org (42/48)

Resolve org