merge server change