limit checks for merge conflicts to files affected by the merge Performance problems reported by naddy