Resolve org (16/48)

Resolve org