add never resync option and remove second level