add a server
merge