fix scanning after merge