server merge