Sync with upstream while keeping custom settings