This
is
the
current
version
of
the
<<<<<<<
file.
|||||||
file
=======
file that has changed
>>>>>>>

