changed servers template
fixed merge