merge server changes