Merge server with github