this will be renamed in ours
and a file with the same name
will be independently added
in theirs

this will be renamed in ours
and a file with the same name
will be independently added
in theirs

this will be renamed in ours
and a file with the same name
will be independently added
in theirs

this will be renamed in ours
and a file with the same name
will be independently added
in theirs

this will be renamed in ours
and a file with the same name
will be independently added
in theirs
