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

