Remove uncontested renamed files during merge.