Resolve org (45/48)

Resolve org