trying to restore sync without need for conflict resolving by reverting to point before and recommitting