<<<<<<<
this file is changed in master and branch
=======
this
>>>>>>>
file
is
conflicting
but in
an unrelated
branch
