Resolve org (47/48)

Resolve org