merging from server
serving fro server