Merge into server