merged with server - settings
merged with server - settings