Prepare sync with upstream