Use unimpaired for merge conflict finding