initial server configuration
merge changes