skip-initial-scan for merge fix