normalize with local repo

many changes since last sync