cleanup server merge