add diff with upstream