merging onto server