do upstream merge via github