merge server and local repo