fix merge conflict: server.json