<<<<<<<
this is one file that will be renamed
to a common name in the ours and theirs
branches

this is one file that will be renamed
to a common name in the ours and theirs
branches

this is one file that will be renamed
to a common name in the ours and theirs
branches

this is one file that will be renamed
to a common name in the ours and theirs
branches

this is one file that will be renamed
to a common name in the ours and theirs
branches

this is one file that will be renamed
to a common name in the ours and theirs
branches
=======
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
 -
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
 -
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
 -
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
 -
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
 -
this is a different file that will
also be renamed to a common file name
in the ours and theirs branches
>>>>>>>
