Add server info
Resolved conflicts
Add server info