back up the ongoing work and sync from upstream