updated !server for merge