merge server with github