updated !server for after merge