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
