<<<<<<< HEAD
master modification
||||||| merged common ancestors
text
=======
branch modification
>>>>>>> branch
