re-sync to upstream again