server setup edits
merge