add Server.cs
merge conflict