gistfile1.txt

bluesm@vz12176:~/gitEx/proGitBranches$ git merge master 
Auto-merging abc
CONFLICT (content): Merge conflict in abc
Automatic merge failed; fix conflicts and then commit the result.
bluesm@vz12176:~/gitEx/proGitBranches$ cat abc 
<<<<<<< HEAD
This is first verion with typo
This is  new feature of this text, it has new chars in it, so it
is very cool
=======
This is first version with typo
>>>>>>> master