
<<<<<<< found
This is one line of the file
||||||| expected
This is 1 line of the file
=======
This is 1 line of the document
&&&&&&& resolution
This is one line of the document
>>>>>>> replacement

I think this is another line

So is this
