This is the file
in 'theirs' that
was added with
the same name
that another file
was renamed to!

This will cause
a rename/add
conflict!
