Merge server code