<<<<<<< local
test2
=======
test
test file

>>>>>>> other
