Resolve org (46/48)

Resolve org