Updating org settings
Fixing merge