server merging

server merging